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/base_os | |
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/base_os')
-rw-r--r-- | roles/base_os/tasks/main.yaml | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/roles/base_os/tasks/main.yaml b/roles/base_os/tasks/main.yaml index ff8cfbe33..01d2898c5 100644 --- a/roles/base_os/tasks/main.yaml +++ b/roles/base_os/tasks/main.yaml @@ -2,25 +2,30 @@ # basic role, configures irbrc, vimrc - name: Ensure irbrc is installed for user root - copy: > - src=irbrc - dest=/root/.irbrc + copy: + src: irbrc + dest: /root/.irbrc - name: Ensure vimrc is installed for user root - copy: > - src=vimrc - dest=/root/.vimrc + copy: + src: vimrc + dest: /root/.vimrc - name: Ensure vimrc is installed for user root - copy: > - src=vimrc - dest=/root/.vimrc + copy: + src: vimrc + dest: /root/.vimrc - name: Install firewalld - yum: pkg=firewalld state=installed + yum: + pkg: firewalld + state: installed - name: enable firewalld service command: /usr/bin/systemctl enable firewalld.service - name: start firewalld service command: /usr/bin/systemctl start firewalld.service + +- name: need to pause here, otherwise the firewalld service starting can sometimes cause ssh to fail + pause: seconds=10 |