summaryrefslogtreecommitdiffstats
path: root/roles/openshift_minion
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2014-10-03 15:16:18 -0700
committerJhon Honce <jhonce@redhat.com>2014-10-03 15:16:18 -0700
commitb00727520bc903efc02ece721c3500e599f18b75 (patch)
tree6eb2b8951fa06072b4a58f325ade5fa158e670ef /roles/openshift_minion
parentb1b2cbe00cfe766a414972352730454c1e79c2c2 (diff)
downloadopenshift-b00727520bc903efc02ece721c3500e599f18b75.tar.gz
openshift-b00727520bc903efc02ece721c3500e599f18b75.tar.bz2
openshift-b00727520bc903efc02ece721c3500e599f18b75.tar.xz
openshift-b00727520bc903efc02ece721c3500e599f18b75.zip
WIP Infra - Use variables in roles
Diffstat (limited to 'roles/openshift_minion')
-rw-r--r--roles/openshift_minion/tasks/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_minion/tasks/main.yml b/roles/openshift_minion/tasks/main.yml
index c43575945..2b1f5332e 100644
--- a/roles/openshift_minion/tasks/main.yml
+++ b/roles/openshift_minion/tasks/main.yml
@@ -10,7 +10,7 @@
line="{{ item.line }}"
with_items:
- { regex: '^OPENSHIFT_MASTER', line: 'OPENSHIFT_MASTER=\"{{ oo_master_ips[0] }}\"' }
- - { regex: '^OPENSHIFT_BIND_ADDR', line: 'OPENSHIFT_BIND_ADDR=\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\"'}
+ - { regex: '^OPENSHIFT_BIND_ADDR', line: 'OPENSHIFT_BIND_ADDR=\"{{ oo_bind_ip }}\"'}
notify:
- restart openshift-minion
@@ -26,5 +26,5 @@
service: name=openshift enabled=yes state=started
- name: Register with OpenShift master
- command: "curl -X POST -H 'Accept: application/json' -d '{\"kind\":\"Minion\", \"id\":\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\", \"apiVersion\":\"v1beta1\", \"hostIP\":\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\" }' http://{{ oo_master_ips[0] }}:8080/api/v1beta1/minions"
+ command: "curl -X POST -H 'Accept: application/json' -d '{\"kind\":\"Minion\", \"id\":\"{{ oo_bind_ip }}\", \"apiVersion\":\"v1beta1\", \"hostIP\":\"{{ oo_bind_ip }}\" }' http://{{ oo_master_ips[0] }}:8080/api/v1beta1/minions"
when: oo_master_ips[0] != ''