diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-04 15:53:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-04 15:53:23 +0000 |
| commit | e72c8f11472ce30adf02d0c39d6de144ac9b4fc7 (patch) | |
| tree | 56291b1c25033a53370cc4956f66cb151b4e9010 | |
| parent | 91f3bb0395d22760db8c941070cc9cc121e58ad6 (diff) | |
| parent | 50aafb8645a9918b8dc746711ac2a15429cb7bd9 (diff) | |
| download | kolla-e72c8f11472ce30adf02d0c39d6de144ac9b4fc7.tar.gz kolla-e72c8f11472ce30adf02d0c39d6de144ac9b4fc7.zip | |
Merge "Playbook for magnum upgrade"
| -rw-r--r-- | ansible/roles/magnum/tasks/bootstrap.yml | 19 | ||||
| -rw-r--r-- | ansible/roles/magnum/tasks/bootstrap_service.yml | 19 | ||||
| -rw-r--r-- | ansible/roles/magnum/tasks/upgrade.yml | 6 |
3 files changed, 26 insertions, 18 deletions
diff --git a/ansible/roles/magnum/tasks/bootstrap.yml b/ansible/roles/magnum/tasks/bootstrap.yml index ac33dc4a3..bd91c161b 100644 --- a/ansible/roles/magnum/tasks/bootstrap.yml +++ b/ansible/roles/magnum/tasks/bootstrap.yml @@ -35,22 +35,5 @@ run_once: True delegate_to: "{{ groups['magnum-api'][0] }}" -- name: Running Magnum bootstrap container - kolla_docker: - action: "start_container" - common_options: "{{ docker_common_options }}" - detach: False - environment: - KOLLA_BOOTSTRAP: - KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" - image: "{{ magnum_api_image_full }}" - labels: - BOOTSTRAP: - name: "bootstrap_magnum" - restart_policy: "never" - volumes: - - "{{ node_config_directory }}/magnum-api/:{{ container_config_directory }}/:ro" - - "kolla_logs:/var/log/kolla/" - run_once: True - delegate_to: "{{ groups['magnum-api'][0] }}" +- include: bootstrap_service.yml when: database_created diff --git a/ansible/roles/magnum/tasks/bootstrap_service.yml b/ansible/roles/magnum/tasks/bootstrap_service.yml new file mode 100644 index 000000000..01ba3ffba --- /dev/null +++ b/ansible/roles/magnum/tasks/bootstrap_service.yml @@ -0,0 +1,19 @@ +--- +- name: Running Magnum bootstrap container + kolla_docker: + action: "start_container" + common_options: "{{ docker_common_options }}" + detach: False + environment: + KOLLA_BOOTSTRAP: + KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" + image: "{{ magnum_api_image_full }}" + labels: + BOOTSTRAP: + name: "bootstrap_magnum" + restart_policy: "never" + volumes: + - "{{ node_config_directory }}/magnum-api/:{{ container_config_directory }}/:ro" + - "kolla_logs:/var/log/kolla" + run_once: True + delegate_to: "{{ groups['magnum-api'][0] }}" diff --git a/ansible/roles/magnum/tasks/upgrade.yml b/ansible/roles/magnum/tasks/upgrade.yml index ed97d539c..fb39089f5 100644 --- a/ansible/roles/magnum/tasks/upgrade.yml +++ b/ansible/roles/magnum/tasks/upgrade.yml @@ -1 +1,7 @@ --- +- include: config.yml + +- include: bootstrap_service.yml + +- include: start.tml + serial: "30%" |