diff options
| -rw-r--r-- | pillar/openbook/ansible.sls | 39 | ||||
| -rw-r--r-- | salt/openbook/ansible/init.sls | 12 |
2 files changed, 20 insertions, 31 deletions
diff --git a/pillar/openbook/ansible.sls b/pillar/openbook/ansible.sls index 1f48978..4769452 100644 --- a/pillar/openbook/ansible.sls +++ b/pillar/openbook/ansible.sls @@ -189,8 +189,26 @@ ansible: mode: "0644" relative_to_buildroot: True is_template: False - inventory_json_rb: - name: inventory_json.rb + inventory_json__unstable_rb: + name: inventory_json_unstable.rb + source: inventory_json.rb + mode: "0755" + relative_to_buildroot: True + is_template: False + inventory_json__develop_rb: + name: inventory_json_develop.rb + source: inventory_json.rb + mode: "0755" + relative_to_buildroot: True + is_template: False + inventory_json__stage_rb: + name: inventory_json_stage.rb + source: inventory_json.rb + mode: "0755" + relative_to_buildroot: True + is_template: False + inventory_json__master_rb: + name: inventory_json_master.rb source: inventory_json.rb mode: "0755" relative_to_buildroot: True @@ -225,20 +243,3 @@ ansible: mode: "0755" relative_to_buildroot: False is_template: False - symlinks: - inventory_json_unstable_rb: - name: inventory_json_unstable.rb - target: inventory_json.rb - relative_to_buildroot: True - inventory_json_develop_rb: - name: inventory_json_develop.rb - target: inventory_json.rb - relative_to_buildroot: True - inventory_json_stage_rb: - name: inventory_json_stage.rb - target: inventory_json.rb - relative_to_buildroot: True - inventory_json_master_rb: - name: inventory_json_master.rb - target: inventory_json.rb - relative_to_buildroot: True diff --git a/salt/openbook/ansible/init.sls b/salt/openbook/ansible/init.sls index 971ea03..aab0cb0 100644 --- a/salt/openbook/ansible/init.sls +++ b/salt/openbook/ansible/init.sls @@ -28,15 +28,3 @@ ansible_files_{{ file[0] }}: - group: root - mode: {{ file[1]["mode"] }} {% endfor %} - -{% for symlink in pillar["ansible"]["symlinks"].items() %} -ansible_symlinks_{{ symlink[0] }}: - file.symlink: -{% if symlink[1]["relative_to_buildroot"] %} - - name: {{ pillar["ansible"]["build_dir"] }}/{{ symlink[1]["name"] }} - - target: {{ pillar["ansible"]["build_dir"] }}/{{ symlink[1]["target"] }} -{% else %} - - name: {{ symlink[1]["name"] }} - - target: {{ symlink[1]["target"] }} -{% endif %} -{% endfor %} |