Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mysql-formula
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
salt
mysql-formula
Commits
454f09d6
Commit
454f09d6
authored
10 years ago
by
tiger-seo
Browse files
Options
Downloads
Patches
Plain Diff
fixes #56: pillar lookup.server value is ignored
parent
c0c9dbd6
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
mysql/client.sls
+1
-1
1 addition, 1 deletion
mysql/client.sls
mysql/database.sls
+1
-1
1 addition, 1 deletion
mysql/database.sls
mysql/server.sls
+1
-1
1 addition, 1 deletion
mysql/server.sls
with
3 additions
and
3 deletions
mysql/client.sls
+
1
−
1
View file @
454f09d6
{% from "mysql/defaults.yaml" import rawmap with context %}
{% from "mysql/defaults.yaml" import rawmap with context %}
{%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:
server:
lookup')) %}
{%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:lookup')) %}
mysql:
mysql:
pkg.installed:
pkg.installed:
...
...
This diff is collapsed.
Click to expand it.
mysql/database.sls
+
1
−
1
View file @
454f09d6
{% from "mysql/defaults.yaml" import rawmap with context %}
{% from "mysql/defaults.yaml" import rawmap with context %}
{%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:
server:
lookup')) %}
{%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:lookup')) %}
{% set mysql_root_pass = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %}
{% set mysql_root_pass = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %}
{% set db_states = [] %}
{% set db_states = [] %}
...
...
This diff is collapsed.
Click to expand it.
mysql/server.sls
+
1
−
1
View file @
454f09d6
{% from "mysql/defaults.yaml" import rawmap with context %}
{% from "mysql/defaults.yaml" import rawmap with context %}
{%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:
server:
lookup')) %}
{%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:lookup')) %}
{% set os = salt['grains.get']('os', None) %}
{% set os = salt['grains.get']('os', None) %}
{% set os_family = salt['grains.get']('os_family', None) %}
{% set os_family = salt['grains.get']('os_family', None) %}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment