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_base/tasks | |
| 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_base/tasks')
| -rw-r--r-- | roles/atomic_base/tasks/bash.yml | 13 | ||||
| -rw-r--r-- | roles/atomic_base/tasks/ostree.yml | 18 |
2 files changed, 16 insertions, 15 deletions
diff --git a/roles/atomic_base/tasks/bash.yml b/roles/atomic_base/tasks/bash.yml index 6e577971a..547ae83c3 100644 --- a/roles/atomic_base/tasks/bash.yml +++ b/roles/atomic_base/tasks/bash.yml @@ -5,9 +5,10 @@ - name: Link to .profile to .bashrc file: src=/root/.bashrc dest=/root/.profile owner=root group=root state=link -- name: Setup Timezone [{{ oo_timezone }}] - file: > - src=/usr/share/zoneinfo/{{ oo_timezone }} - dest=/etc/localtime - owner=root - group=root state=link +- name: "Setup Timezone [{{ oo_timezone }}]" + file: + src: "/usr/share/zoneinfo/{{ oo_timezone }}" + dest: /etc/localtime + owner: root + group: root + state: link diff --git a/roles/atomic_base/tasks/ostree.yml b/roles/atomic_base/tasks/ostree.yml index b9d366f1b..aacaa5efd 100644 --- a/roles/atomic_base/tasks/ostree.yml +++ b/roles/atomic_base/tasks/ostree.yml @@ -1,18 +1,18 @@ --- - name: Copy ostree repo config - copy: > - src=ostree/repo_config - dest=/ostree/repo/config - owner=root - group=root - mode=0644 + copy: + src: ostree/repo_config + dest: /ostree/repo/config + owner: root + group: root + mode: 0644 - name: "WORK AROUND: Stat redhat repo file" stat: path=/etc/yum.repos.d/redhat.repo register: redhat_repo - name: "WORK AROUND: subscription manager failures" - file: > - path=/etc/yum.repos.d/redhat.repo - state=touch + file: + path: /etc/yum.repos.d/redhat.repo + state: touch when: redhat_repo.stat.exists == False |