aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Peeler <jpeeler@redhat.com>2016-02-09 14:04:38 -0500
committerJeff Peeler <jpeeler@redhat.com>2016-02-22 10:25:51 -0500
commit301602d8f114d6b78e7f90cf32c961d75fba062c (patch)
tree3391d80f492ad88627a66cd3e063976e298738b1
parent0e67afb73bf27ce3e0f5b0325c9394e5c8aa3be5 (diff)
downloadkolla-301602d8f114d6b78e7f90cf32c961d75fba062c.tar.gz
kolla-301602d8f114d6b78e7f90cf32c961d75fba062c.zip
Playbook for glance upgrade
New playbook for glance service upgrade. Change-Id: I759e4eddf669112f752fe07d6b99a4bb9593d97f Implements: blueprint upgrade-glance Partially-Implements: blueprint upgrade-kolla
-rw-r--r--ansible/roles/glance/tasks/bootstrap.yml20
-rw-r--r--ansible/roles/glance/tasks/bootstrap_service.yml19
-rw-r--r--ansible/roles/glance/tasks/upgrade.yml6
3 files changed, 26 insertions, 19 deletions
diff --git a/ansible/roles/glance/tasks/bootstrap.yml b/ansible/roles/glance/tasks/bootstrap.yml
index 6b8221e19..08c027b67 100644
--- a/ansible/roles/glance/tasks/bootstrap.yml
+++ b/ansible/roles/glance/tasks/bootstrap.yml
@@ -36,23 +36,5 @@
run_once: True
delegate_to: "{{ groups['glance-api'][0] }}"
-- name: Running Glance bootstrap container
- kolla_docker:
- action: "start_container"
- common_options: "{{ docker_common_options }}"
- detach: False
- environment:
- KOLLA_BOOTSTRAP:
- KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
- image: "{{ glance_api_image_full }}"
- labels:
- BOOTSTRAP:
- name: "bootstrap_glance"
- restart_policy: "never"
- volumes:
- - "{{ node_config_directory }}/glance-api/:{{ container_config_directory }}/:ro"
- - "glance:/var/lib/glance/"
- - "kolla_logs:/var/log/kolla/"
- run_once: True
- delegate_to: "{{ groups['glance-api'][0] }}"
+- include: bootstrap_service.yml
when: database_created
diff --git a/ansible/roles/glance/tasks/bootstrap_service.yml b/ansible/roles/glance/tasks/bootstrap_service.yml
new file mode 100644
index 000000000..6426c36a9
--- /dev/null
+++ b/ansible/roles/glance/tasks/bootstrap_service.yml
@@ -0,0 +1,19 @@
+- name: Running Glance bootstrap container
+ kolla_docker:
+ action: "start_container"
+ common_options: "{{ docker_common_options }}"
+ detach: False
+ environment:
+ KOLLA_BOOTSTRAP:
+ KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
+ image: "{{ glance_api_image_full }}"
+ labels:
+ BOOTSTRAP:
+ name: "bootstrap_glance"
+ restart_policy: "never"
+ volumes:
+ - "{{ node_config_directory }}/glance-api/:{{ container_config_directory }}/:ro"
+ - "glance:/var/lib/glance/"
+ - "kolla_logs:/var/log/kolla/"
+ run_once: True
+ delegate_to: "{{ groups['glance-api'][0] }}"
diff --git a/ansible/roles/glance/tasks/upgrade.yml b/ansible/roles/glance/tasks/upgrade.yml
index ed97d539c..c0e3b19a4 100644
--- a/ansible/roles/glance/tasks/upgrade.yml
+++ b/ansible/roles/glance/tasks/upgrade.yml
@@ -1 +1,7 @@
---
+- include: config.yml
+
+- include: bootstrap_service.yml
+
+- include: start.yml
+ serial: "30%"