diff options
| -rw-r--r-- | pillar/openbook/ansible.sls | 34 | ||||
| -rw-r--r-- | salt/openbook/ansible/init.sls | 28 |
2 files changed, 50 insertions, 12 deletions
diff --git a/pillar/openbook/ansible.sls b/pillar/openbook/ansible.sls index 6d7285b..1f48978 100644 --- a/pillar/openbook/ansible.sls +++ b/pillar/openbook/ansible.sls @@ -25,171 +25,205 @@ ansible: name: playbooks/install_openbook.yaml source: install_openbook.yaml mode: "0644" + relative_to_buildroot: True is_template: False playbooks_install_docker_registry_yaml: name: playbooks/install_docker_registry.yaml source: install_docker_registry.yaml mode: "0644" + relative_to_buildroot: True is_template: False playbooks_install_openbook_docker_slave_yaml: name: playbooks/install_openbook_docker_slave.yaml source: install_openbook_docker_slave.yaml mode: "0644" + relative_to_buildroot: True is_template: False playbooks_salt_yaml: name: playbooks/salt.yaml source: salt.yaml mode: "0644" + relative_to_buildroot: True is_template: False playbooks_docker_yaml: name: playbooks/docker.yaml source: docker.yaml mode: "0644" + relative_to_buildroot: True is_template: False playbooks_docker_compose_yaml: name: playbooks/docker_compose.yaml source: docker_compose.yaml mode: "0644" + relative_to_buildroot: True is_template: False playbooks_docker_registry_yaml: name: playbooks/docker_registry.yaml source: docker_registry.yaml mode: "0644" + relative_to_buildroot: True is_template: False playbooks_mysql_client_yaml: name: playbooks/mysql_client.yaml source: mysql_client.yaml mode: "0644" + relative_to_buildroot: True is_template: False playbooks_haveged_yaml: name: playbooks/haveged.yaml source: haveged.yaml mode: "0644" + relative_to_buildroot: True is_template: False playbooks_openjdk_yaml: name: playbooks/openjdk.yaml source: openjdk.yaml mode: "0644" + relative_to_buildroot: True is_template: False playbooks_gradle_yaml: name: playbooks/gradle.yaml source: gradle.yaml mode: "0644" + relative_to_buildroot: True is_template: False playbooks_ssh_keys_yaml: name: playbooks/ssh_keys.yaml source: ssh_keys.yaml mode: "0644" + relative_to_buildroot: True is_template: False playbooks_jenkins_user_yaml: name: playbooks/jenkins_user.yaml source: jenkins_user.yaml mode: "0644" + relative_to_buildroot: True is_template: False playbooks_ansible_yaml: name: playbooks/ansible.yaml source: ansible.yaml mode: "0644" + relative_to_buildroot: True is_template: False playbooks_openbook_yaml: name: playbooks/openbook.yaml source: openbook.yaml mode: "0644" + relative_to_buildroot: True is_template: True saltstack_list: name: files/saltstack.list source: saltstack.list mode: "0644" + relative_to_buildroot: True is_template: False docker_list: name: files/docker.list source: docker.list mode: "0644" + relative_to_buildroot: True is_template: False mariadb_list: name: files/mariadb.list source: mariadb.list mode: "0644" + relative_to_buildroot: True is_template: False ansible_cfg: name: files/ansible.cfg source: ansible.cfg mode: "0644" + relative_to_buildroot: True is_template: False salt_master: name: files/master source: salt_master mode: "0644" + relative_to_buildroot: True is_template: False docker_registry_ubuntu: name: files/docker-registry.ubuntu source: docker-registry.ubuntu mode: "0644" + relative_to_buildroot: True is_template: False docker_registry_gentoo: name: files/docker-registry.gentoo source: docker-registry.gentoo mode: "0644" + relative_to_buildroot: True is_template: False docker_compose_yaml: name: files/docker-compose.yaml source: docker-compose.yaml mode: "0644" + relative_to_buildroot: True is_template: False slave_jar: name: files/slave.jar source: slave.jar mode: "0644" + relative_to_buildroot: True is_template: False registry_conf: name: templates/registry.conf source: registry.conf mode: "0644" + relative_to_buildroot: True is_template: True conf_env_yaml_openbook_example: name: conf/env.yaml.openbook.example source: env.yaml.openbook.example mode: "0644" + relative_to_buildroot: True is_template: False conf_env_yaml_docker_registry_example: name: conf/env.yaml.docker_registry.example source: env.yaml.docker_registry.example mode: "0644" + relative_to_buildroot: True is_template: False conf_env_yaml_openbook_docker_slave_example: name: conf/env.yaml.openbook_docker_slave.example source: env.yaml.openbook_docker_slave.example mode: "0644" + relative_to_buildroot: True is_template: False inventory_json_rb: name: inventory_json.rb source: inventory_json.rb mode: "0755" + relative_to_buildroot: True is_template: False deploy_branch_sh: name: deploy-branch.sh source: deploy-branch.sh mode: "0755" + relative_to_buildroot: True is_template: False openbook_installer_yaml: name: openbook_installer.yaml source: openbook_installer.yaml mode: "0644" + relative_to_buildroot: True is_template: False docker_registry_installer_yaml: name: docker_registry_installer.yaml source: docker_registry_installer.yaml mode: "0644" + relative_to_buildroot: True is_template: False openbook_docker_slave_installer_yaml: name: openbook_docker_slave_installer.yaml source: openbook_docker_slave_installer.yaml mode: "0644" + relative_to_buildroot: True is_template: False find_next_tag_sh: name: /var/lib/jenkins/find_next_tag.sh source: find_next_tag.sh mode: "0755" + relative_to_buildroot: False is_template: False symlinks: inventory_json_unstable_rb: diff --git a/salt/openbook/ansible/init.sls b/salt/openbook/ansible/init.sls index b446c33..547544d 100644 --- a/salt/openbook/ansible/init.sls +++ b/salt/openbook/ansible/init.sls @@ -12,22 +12,14 @@ ansible_dirs_{{ dir[0] }}: - makedirs: True {% 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 %} - {% for file in pillar["ansible"]["files"].items() %} ansible_files_{{ file[0] }}: file.managed: +{% if file[1]["relative_to_buildroot"] %} - name: {{ pillar["ansible"]["build_dir"] }}/{{ file[1]["name"] }} +{% else %} + - name: {{ {{ file[1]["name"] }} +{% endif %} - source: salt://openbook/ansible/files/{{ file[1]["source"] }} {% if file[1]["is_template"] %} - template: jinja @@ -36,3 +28,15 @@ 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 %} |