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/openshift_master | |
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/openshift_master')
-rw-r--r-- | roles/openshift_master/tasks/main.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 3cfb2dd7d..6826ef452 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -8,10 +8,10 @@ command: /usr/bin/hostname {{ oo_bind_ip }} - name: Configure OpenShift Master settings - lineinfile: > - dest=/etc/sysconfig/openshift - regexp={{ item.regex }} - line="{{ item.line }}" + lineinfile: + dest: /etc/sysconfig/openshift + regexp: "{{ item.regex }}" + line: "{{ item.line }}" with_items: - { regex: '^ROLE=', line: 'ROLE=\"master\"' } - { regex: '^OPTIONS=', line: 'OPTIONS=\"--nodes={{ oo_minion_ips | join(",") }} --loglevel=5\"' } |