diff options
| author | Jhon Honce <jhonce@redhat.com> | 2014-10-03 15:16:18 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2014-10-03 15:16:18 -0700 |
| commit | b00727520bc903efc02ece721c3500e599f18b75 (patch) | |
| tree | 6eb2b8951fa06072b4a58f325ade5fa158e670ef /roles | |
| parent | b1b2cbe00cfe766a414972352730454c1e79c2c2 (diff) | |
| download | openshift-b00727520bc903efc02ece721c3500e599f18b75.tar.gz openshift-b00727520bc903efc02ece721c3500e599f18b75.tar.bz2 openshift-b00727520bc903efc02ece721c3500e599f18b75.tar.xz openshift-b00727520bc903efc02ece721c3500e599f18b75.zip | |
WIP Infra - Use variables in roles
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_minion/tasks/main.yml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 5a940c88a..83573cb27 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -9,8 +9,8 @@ regexp={{ item.regex }} line="{{ item.line }}" with_items: - - { regex: '^OPENSHIFT_MASTER', line: 'OPENSHIFT_MASTER=\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\"' } - - { regex: '^OPENSHIFT_BIND_ADDR', line: 'OPENSHIFT_BIND_ADDR=\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\"'} + - { regex: '^OPENSHIFT_MASTER', line: 'OPENSHIFT_MASTER=\"{{ oo_bind_ip }}\"' } + - { regex: '^OPENSHIFT_BIND_ADDR', line: 'OPENSHIFT_BIND_ADDR=\"{{ oo_bind_ip }}\"'} notify: - restart openshift-master 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] != '' |