diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-02-05 16:02:00 -0500 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-02-05 16:02:00 -0500 |
| commit | 04343e7588118359d178fa63554909efb222648a (patch) | |
| tree | 21ae9b09d447700b13e91acf3308748d3a6af8fd /roles/atomic_proxy | |
| parent | 076434d7a1026540f0eee5479adddc895d73b9b0 (diff) | |
| parent | ddf12084e107152f70f7cad82bd1fcdb54880db3 (diff) | |
| download | openshift-04343e7588118359d178fa63554909efb222648a.tar.gz openshift-04343e7588118359d178fa63554909efb222648a.tar.bz2 openshift-04343e7588118359d178fa63554909efb222648a.tar.xz openshift-04343e7588118359d178fa63554909efb222648a.zip | |
Merge pull request #53 from twiest/atomic
Changed os2-atomic-proxy to be able to launch inside of both a vpc and classic. Changed STG to default to launching in a vpc, prod still launches in classic. Also cleaned up some cruft.
Diffstat (limited to 'roles/atomic_proxy')
| -rw-r--r-- | roles/atomic_proxy/tasks/setup_puppet.yml | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/roles/atomic_proxy/tasks/setup_puppet.yml b/roles/atomic_proxy/tasks/setup_puppet.yml index e711d06c1..7a599f06d 100644 --- a/roles/atomic_proxy/tasks/setup_puppet.yml +++ b/roles/atomic_proxy/tasks/setup_puppet.yml @@ -1,24 +1,24 @@ --- - name: make puppet conf dir - file: > - dest={{ oo_proxy_puppet_volume_dir }}/etc/puppet - mode=755 - owner=root - group=root - state=directory + file: + dest: "{{ oo_proxy_puppet_volume_dir }}/etc/puppet" + mode: 755 + owner: root + group: root + state: directory - name: upload puppet auth config - copy: > - src=puppet/auth.conf - dest={{ oo_proxy_puppet_volume_dir }}/etc/puppet/auth.conf - mode=0644 - owner=root - group=root + copy: + src: puppet/auth.conf + dest: "{{ oo_proxy_puppet_volume_dir }}/etc/puppet/auth.conf" + mode: 0644 + owner: root + group: root - name: upload puppet config - template: > - src=puppet/puppet.conf.j2 - dest={{ oo_proxy_puppet_volume_dir }}/etc/puppet/puppet.conf - mode=0644 - owner=root - group=root + template: + src: puppet/puppet.conf.j2 + dest: "{{ oo_proxy_puppet_volume_dir }}/etc/puppet/puppet.conf" + mode: 0644 + owner: root + group: root |