diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-27 17:50:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-27 17:50:52 +0000 |
| commit | c81097df8b0525bcff9df875f38bbfe2ab83be3f (patch) | |
| tree | 47a46491b4e50cb7ceac5d1845bc89443f4e326e /ansible/roles/haproxy/tasks | |
| parent | 3a10f2d6e9cc2877890d29223c923b36f36d6a7a (diff) | |
| parent | d3cfb2052a7321606e3a46fd6846f776d28afd86 (diff) | |
| download | kolla-c81097df8b0525bcff9df875f38bbfe2ab83be3f.tar.gz kolla-c81097df8b0525bcff9df875f38bbfe2ab83be3f.zip | |
Merge "Change kolla_internal_address variable"
Diffstat (limited to 'ansible/roles/haproxy/tasks')
| -rw-r--r-- | ansible/roles/haproxy/tasks/start.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/haproxy/tasks/upgrade.yml | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ansible/roles/haproxy/tasks/start.yml b/ansible/roles/haproxy/tasks/start.yml index 352311d94..7ad4d106a 100644 --- a/ansible/roles/haproxy/tasks/start.yml +++ b/ansible/roles/haproxy/tasks/start.yml @@ -30,4 +30,6 @@ changed_when: status.stdout.find('changed') != -1 - name: Waiting for virtual IP to appear - wait_for: host="{{ kolla_internal_address }}" port="{{ mariadb_port }}" + wait_for: + host: "{{ kolla_internal_vip_address }}" + port: "{{ mariadb_port }}" diff --git a/ansible/roles/haproxy/tasks/upgrade.yml b/ansible/roles/haproxy/tasks/upgrade.yml index c4670a5aa..ce1adcfa3 100644 --- a/ansible/roles/haproxy/tasks/upgrade.yml +++ b/ansible/roles/haproxy/tasks/upgrade.yml @@ -8,12 +8,12 @@ action: "stop_container" common_options: "{{ docker_common_options }}" name: "keepalived" - when: kolla_internal_address not in secondary_addresses + when: kolla_internal_vip_address not in secondary_addresses # Upgrading master keepalived and haproxy - include: start.yml - when: kolla_internal_address in secondary_addresses + when: kolla_internal_vip_address in secondary_addresses # Upgrading slave keepalived and haproxy - include: start.yml - when: kolla_internal_address not in secondary_addresses + when: kolla_internal_vip_address not in secondary_addresses |