diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-02 16:32:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-02 16:32:38 +0000 |
| commit | 3659290d88267866ff51e36e4b5af2cb9a3116bc (patch) | |
| tree | e9ce50f8dc30f1b618a32bb0824a267f674d3a4d | |
| parent | a7033463f47ef9102aeef413a901a0de99504c69 (diff) | |
| parent | 54aa896735a9efc9a24eeb30732f91ec5b971d6d (diff) | |
| download | kolla-3659290d88267866ff51e36e4b5af2cb9a3116bc.tar.gz kolla-3659290d88267866ff51e36e4b5af2cb9a3116bc.zip | |
Merge "Playbook for upgrade murano"
| -rw-r--r-- | ansible/roles/murano/tasks/bootstrap.yml | 17 | ||||
| -rw-r--r-- | ansible/roles/murano/tasks/bootstrap_service.yml | 17 | ||||
| -rw-r--r-- | ansible/roles/murano/tasks/upgrade.yml | 6 |
3 files changed, 24 insertions, 16 deletions
diff --git a/ansible/roles/murano/tasks/bootstrap.yml b/ansible/roles/murano/tasks/bootstrap.yml index 0d07a0cec..aafabbbb1 100644 --- a/ansible/roles/murano/tasks/bootstrap.yml +++ b/ansible/roles/murano/tasks/bootstrap.yml @@ -36,20 +36,5 @@ run_once: True delegate_to: "{{ groups['murano-api'][0] }}" -- name: Running Murano bootstrap container - kolla_docker: - action: "start_container" - common_options: "{{ docker_common_options }}" - detach: False - environment: - KOLLA_BOOTSTRAP: - KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" - image: "{{ murano_api_image_full }}" - labels: - BOOTSTRAP: - name: "bootstrap_murano" - restart_policy: "never" - volumes: "{{ node_config_directory }}/murano-api/:{{ container_config_directory }}/:ro" - run_once: True - delegate_to: "{{ groups['murano-api'][0] }}" +- include: bootstrap_service.yml when: database_created diff --git a/ansible/roles/murano/tasks/bootstrap_service.yml b/ansible/roles/murano/tasks/bootstrap_service.yml new file mode 100644 index 000000000..887f05cc5 --- /dev/null +++ b/ansible/roles/murano/tasks/bootstrap_service.yml @@ -0,0 +1,17 @@ +--- +- name: Running Murano bootstrap container + kolla_docker: + action: "start_container" + common_options: "{{ docker_common_options }}" + detach: False + environment: + KOLLA_BOOTSTRAP: + KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" + image: "{{ murano_api_image_full }}" + labels: + BOOTSTRAP: + name: "bootstrap_murano" + restart_policy: "never" + volumes: "{{ node_config_directory }}/murano-api/:{{ container_config_directory }}/:ro" + run_once: True + delegate_to: "{{ groups['murano-api'][0] }}" diff --git a/ansible/roles/murano/tasks/upgrade.yml b/ansible/roles/murano/tasks/upgrade.yml index ed97d539c..c0e3b19a4 100644 --- a/ansible/roles/murano/tasks/upgrade.yml +++ b/ansible/roles/murano/tasks/upgrade.yml @@ -1 +1,7 @@ --- +- include: config.yml + +- include: bootstrap_service.yml + +- include: start.yml + serial: "30%" |