aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-23 07:14:26 +0000
committerGerrit Code Review <review@openstack.org>2016-03-23 07:14:27 +0000
commitd9d70d050275d55d644127dbaa6a0fccbb86485a (patch)
treea71f6bd232ba05a24bbf7153fb50060a87c18e64
parentada9ac95a01382e7ff2cd2f419951b5595577f6f (diff)
parenta41ab6fd736edbf432c474bcf9d1e56964b5d066 (diff)
downloadkolla-d9d70d050275d55d644127dbaa6a0fccbb86485a.tar.gz
kolla-d9d70d050275d55d644127dbaa6a0fccbb86485a.zip
Merge "Reconfigure for haproxy"
-rw-r--r--ansible/roles/haproxy/tasks/do_reconfigure.yml74
-rw-r--r--ansible/roles/haproxy/tasks/reconfigure.yml3
2 files changed, 77 insertions, 0 deletions
diff --git a/ansible/roles/haproxy/tasks/do_reconfigure.yml b/ansible/roles/haproxy/tasks/do_reconfigure.yml
new file mode 100644
index 000000000..034f28f6c
--- /dev/null
+++ b/ansible/roles/haproxy/tasks/do_reconfigure.yml
@@ -0,0 +1,74 @@
+---
+- name: Ensuring the containers up
+ kolla_docker:
+ name: "{{ item.name }}"
+ action: "get_container_state"
+ register: container_state
+ failed_when: container_state.Running == false
+ when: inventory_hostname in groups[item.group]
+ with_items:
+ - { name: haproxy, group: haproxy }
+ - { name: keepalived, group: haproxy }
+
+- include: config.yml
+
+- name: Check the configs
+ command: docker exec {{ item.name }} /usr/local/bin/kolla_set_configs --check
+ changed_when: false
+ failed_when: false
+ register: check_results
+ when: inventory_hostname in groups[item.group]
+ with_items:
+ - { name: haproxy, group: haproxy }
+ - { name: keepalived, group: haproxy }
+
+- name: Containers config strategy
+ kolla_docker:
+ name: "{{ item.name }}"
+ action: "get_container_env"
+ register: container_envs
+ when: inventory_hostname in groups[item.group]
+ with_items:
+ - { name: haproxy, group: haproxy }
+ - { name: keepalived, group: haproxy }
+
+- name: Remove the containers
+ kolla_docker:
+ name: "{{ item[0]['name'] }}"
+ action: "remove_container"
+ register: remove_containers
+ when:
+ - config_strategy == "COPY_ONCE" or item[1]['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE'
+ - item[2]['rc'] == 1
+ - inventory_hostname in groups[item[0]['group']]
+ with_together:
+ - [{ name: haproxy, group: haproxy },
+ { name: keepalived, group: haproxy }]
+ - container_envs.results
+ - check_results.results
+
+- include: start.yml
+ when: remove_containers.changed
+
+# container_envs.results is a list of two elements, first corresponds to
+# haproxy container result and second to keepalived container result and the
+# same applicable for check_results.results
+- name: Ensuring latest haproxy config is used
+ command: docker exec haproxy /usr/local/bin/kolla_ensure_haproxy_latest_config
+ register: status
+ changed_when: status.stdout.find('changed') != -1
+ when:
+ - config_strategy == 'COPY_ALWAYS'
+ - container_envs.results[0]['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE'
+ - check_results.results[0]['rc'] == 1
+ - inventory_hostname in groups['haproxy']
+
+- name: Restart keepalived container
+ kolla_docker:
+ name: "keepalived"
+ action: "restart_container"
+ when:
+ - config_strategy == 'COPY_ALWAYS'
+ - container_envs.results[1]['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE'
+ - check_results.results[1]['rc'] == 1
+ - inventory_hostname in groups['haproxy']
diff --git a/ansible/roles/haproxy/tasks/reconfigure.yml b/ansible/roles/haproxy/tasks/reconfigure.yml
index ed97d539c..f13bfa549 100644
--- a/ansible/roles/haproxy/tasks/reconfigure.yml
+++ b/ansible/roles/haproxy/tasks/reconfigure.yml
@@ -1 +1,4 @@
---
+- include: do_reconfigure.yml
+ serial: "30%"
+ when: inventory_hostname in groups['haproxy']