diff options
| author | Kevin Fenzi <kevin@scrye.com> | 2014-01-08 17:42:18 +0000 |
|---|---|---|
| committer | Kevin Fenzi <kevin@scrye.com> | 2014-01-08 17:42:18 +0000 |
| commit | 136866729f902ced3fcd10c0a9b6b7aacf0d76cf (patch) | |
| tree | c82e26169a5e5062b2f9c49bd786fc599a5cfa39 | |
| parent | a97ce78813179b57d89550dbe28af29ceccd51a4 (diff) | |
| download | ansible-136866729f902ced3fcd10c0a9b6b7aacf0d76cf.tar.gz ansible-136866729f902ced3fcd10c0a9b6b7aacf0d76cf.tar.xz ansible-136866729f902ced3fcd10c0a9b6b7aacf0d76cf.zip | |
Clean up some more old syntax
| -rw-r--r-- | CONVENTIONS | 4 | ||||
| -rw-r--r-- | README | 12 | ||||
| -rw-r--r-- | playbooks/sign_and_import.yml | 16 |
3 files changed, 16 insertions, 16 deletions
diff --git a/CONVENTIONS b/CONVENTIONS index 9e57438eb..f6c2eec65 100644 --- a/CONVENTIONS +++ b/CONVENTIONS @@ -37,8 +37,8 @@ be used in specific cases where a generic group playbook would not work. Both groups and hosts playbooks should always include: vars_files: - /srv/web/infra/ansible/vars/global.yml - - ${private}/vars.yml - - ${vars}/${ansible_distribution}.yml + - "{{ private}}/vars.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml Play naming =========== @@ -143,10 +143,10 @@ The available images can be found by running:: vars_files: - /srv/web/infra/ansible/vars/global.yml - - ${private}/vars.yml + - "{{ private }}/vars.yml" tasks: - - include: $tasks/persistent_cloud.yml + - include: "{{ tasks }}/persistent_cloud.yml" - name: provision instance hosts: $YOUR_HOSTNAME/IP HERE @@ -155,15 +155,15 @@ The available images can be found by running:: vars_files: - /srv/web/infra/ansible/vars/global.yml - - ${private}/vars.yml - - ${vars}/${ansible_distribution}.yml + - "{{ private }}/vars.yml" + - /srv/web/infra/ansible/vars//{{ ansible_distribution }}.yml tasks: - - include: $tasks/cloud_setup_basic.yml + - include: "{{ tasks }}/cloud_setup_basic.yml # fill in other actions/includes/etc here handlers: - - include: $handlers/restart_services.yml + - include: "{{ handlers }}/restart_services.yml 5. add/commit the above to the git repo and push your changes diff --git a/playbooks/sign_and_import.yml b/playbooks/sign_and_import.yml index a18806bb0..e1498fad7 100644 --- a/playbooks/sign_and_import.yml +++ b/playbooks/sign_and_import.yml @@ -33,27 +33,27 @@ file: path={{ rpmdir }}-old state=directory - name: copy the source rpms to the SRPMS dir - copy: src=${item} dest=${repodir}/SRPMS/ + copy: src={{ item }} dest={{ repodir }}/SRPMS/ with_fileglob: - "{{ rpmdir }}/*.src.rpm" - name: Run createrepo on the srpm dir - command: createrepo --update ${repodir}/SRPMS/ + command: createrepo --update {{ repodir }}/SRPMS/ - - name: move processed srpms out to ${rpmdir}-old - command: /bin/mv ${item} ${rpmdir}-old/ + - name: move processed srpms out to {{ rpmdir }}-old + command: /bin/mv {{ item }} {{ rpmdir }}-old/ with_fileglob: - "{{ rpmdir }}/*.src.rpm" - name: copy the binary rpms to the x86_64 dir - copy: src=${item} dest=${repodir}/x86_64/ + copy: src={{ item }} dest={{ repodir }}/x86_64/ with_fileglob: - "{{ rpmdir }}/*.rpm" - name: Run createrepo on the x86_64 dir - command: createrepo --update ${repodir}/x86_64/ + command: createrepo --update {{ repodir }}/x86_64/ - - name: move processed rpms out to ${rpmdir}-old - command: /bin/mv ${item} ${rpmdir}-old/ + - name: move processed rpms out to {{ rpmdir }}-old + command: /bin/mv {{ item }} {{ rpmdir }}-old/ with_fileglob: - "{{ rpmdir }}/*.rpm" |