diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-22 16:05:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-22 16:05:19 +0000 |
| commit | 08422056d3e4144d07dff778fae4892f42c9be10 (patch) | |
| tree | 28ed24477a91a236022aa84ba50e797de90e1a26 | |
| parent | a10d4250c24c9266994257a68d9c7293459cd3af (diff) | |
| parent | 301602d8f114d6b78e7f90cf32c961d75fba062c (diff) | |
| download | kolla-08422056d3e4144d07dff778fae4892f42c9be10.tar.gz kolla-08422056d3e4144d07dff778fae4892f42c9be10.zip | |
Merge "Playbook for glance upgrade"
| -rw-r--r-- | ansible/roles/glance/tasks/bootstrap.yml | 20 | ||||
| -rw-r--r-- | ansible/roles/glance/tasks/bootstrap_service.yml | 19 | ||||
| -rw-r--r-- | ansible/roles/glance/tasks/upgrade.yml | 6 |
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%" |