aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-07 09:11:31 +0000
committerGerrit Code Review <review@openstack.org>2016-03-07 09:11:31 +0000
commit5c8fb2b1ddaecbe7663e1361c0342e1642f3a7c0 (patch)
tree9aeabb89daac2d43744bfb2119028a7ca07f78bf
parent962be007a4808299453122279b44d20588d706ab (diff)
parent9a5150275bd99b350ed521e87bb1bb9c2cdfe737 (diff)
downloadkolla-5c8fb2b1ddaecbe7663e1361c0342e1642f3a7c0.tar.gz
kolla-5c8fb2b1ddaecbe7663e1361c0342e1642f3a7c0.zip
Merge "Reconfigure horizon service"
-rw-r--r--ansible/roles/horizon/tasks/do_reconfigure.yml64
-rw-r--r--ansible/roles/horizon/tasks/reconfigure.yml3
2 files changed, 67 insertions, 0 deletions
diff --git a/ansible/roles/horizon/tasks/do_reconfigure.yml b/ansible/roles/horizon/tasks/do_reconfigure.yml
new file mode 100644
index 000000000..867f4ef19
--- /dev/null
+++ b/ansible/roles/horizon/tasks/do_reconfigure.yml
@@ -0,0 +1,64 @@
+---
+- 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: horizon, group: horizon }
+
+- 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: horizon, group: horizon }
+
+# NOTE(jeffrey4l): when config_strategy == 'COPY_ALWAYS'
+# and container env['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE',
+# just remove the container and start again
+- 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: horizon, group: horizon }
+
+- 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: horizon, group: horizon }]
+ - container_envs.results
+ - check_results.results
+
+- include: start.yml
+ when: remove_containers.changed
+
+- name: Restart containers
+ kolla_docker:
+ name: "{{ item[0]['name'] }}"
+ action: "restart_container"
+ when:
+ - config_strategy == 'COPY_ALWAYS'
+ - item[1]['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE'
+ - item[2]['rc'] == 1
+ - inventory_hostname in groups[item[0]['group']]
+ with_together:
+ - [{ name: horizon, group: horizon }]
+ - container_envs.results
+ - check_results.results
diff --git a/ansible/roles/horizon/tasks/reconfigure.yml b/ansible/roles/horizon/tasks/reconfigure.yml
index ed97d539c..3e6a838e4 100644
--- a/ansible/roles/horizon/tasks/reconfigure.yml
+++ b/ansible/roles/horizon/tasks/reconfigure.yml
@@ -1 +1,4 @@
---
+- include: do_reconfigure.yml
+ serial: "30%"
+ when: inventory_hostname in groups['horizon']