summaryrefslogtreecommitdiffstats
path: root/roles/openshift_minion
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-02-05 16:02:00 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2015-02-05 16:02:00 -0500
commit04343e7588118359d178fa63554909efb222648a (patch)
tree21ae9b09d447700b13e91acf3308748d3a6af8fd /roles/openshift_minion
parent076434d7a1026540f0eee5479adddc895d73b9b0 (diff)
parentddf12084e107152f70f7cad82bd1fcdb54880db3 (diff)
downloadopenshift-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_minion')
-rw-r--r--roles/openshift_minion/tasks/main.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_minion/tasks/main.yml b/roles/openshift_minion/tasks/main.yml
index e328eb5d5..3821277bc 100644
--- a/roles/openshift_minion/tasks/main.yml
+++ b/roles/openshift_minion/tasks/main.yml
@@ -8,10 +8,10 @@
command: /usr/bin/hostname {{ oo_bind_ip }}
- name: Configure OpenShift Minion 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=\"node\"' }
- { regex: '^OPTIONS=', line: 'OPTIONS=\"--master=http://{{ oo_master_ips[0] }}:8080 --loglevel=5\"' }