aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-09 11:46:57 +0000
committerGerrit Code Review <review@openstack.org>2016-03-09 11:46:57 +0000
commit90793fee226c0afa0e1d417cbe16c01b957746c3 (patch)
tree0f5ee2b9a002656caa8d4320891292a2aa5c1cab /ansible
parent13a60622601a3fc8535c0ee8c10a1da2d0ea928b (diff)
parent21ecd9925aaee7ae4193d854daa1634bf60a27a5 (diff)
downloadkolla-90793fee226c0afa0e1d417cbe16c01b957746c3.tar.gz
kolla-90793fee226c0afa0e1d417cbe16c01b957746c3.zip
Merge "Upgrade Heat"
Diffstat (limited to 'ansible')
-rw-r--r--ansible/roles/heat/tasks/bootstrap.yml25
-rw-r--r--ansible/roles/heat/tasks/bootstrap_service.yml24
-rw-r--r--ansible/roles/heat/tasks/upgrade.yml6
3 files changed, 32 insertions, 23 deletions
diff --git a/ansible/roles/heat/tasks/bootstrap.yml b/ansible/roles/heat/tasks/bootstrap.yml
index 8429c0414..2ac3cfd8c 100644
--- a/ansible/roles/heat/tasks/bootstrap.yml
+++ b/ansible/roles/heat/tasks/bootstrap.yml
@@ -4,6 +4,7 @@
-m mysql_db
-a "login_host='{{ database_address }}'
login_user='{{ database_user }}'
+ login_port='{{ mariadb_port }}'
login_password='{{ database_password }}'
name='{{ heat_database_name }}'"
register: database
@@ -35,27 +36,5 @@
run_once: True
delegate_to: "{{ groups['heat-api'][0] }}"
-- name: Running Heat bootstrap container
- kolla_docker:
- action: "start_container"
- common_options: "{{ docker_common_options }}"
- detach: False
- environment:
- KOLLA_BOOTSTRAP:
- KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
- OS_AUTH_URL: "{{ openstack_auth.auth_url }}"
- OS_IDENTITY_API_VERSION: "3"
- OS_USERNAME: "{{ openstack_auth.username }}"
- OS_PASSWORD: "{{ openstack_auth.password }}"
- OS_PROJECT_NAME: "{{ openstack_auth.project_name }}"
- HEAT_DOMAIN_ADMIN_PASSWORD: "{{ heat_domain_admin_password }}"
- image: "{{ heat_api_image_full }}"
- labels:
- BOOTSTRAP:
- name: "bootstrap_heat"
- volumes:
- - "{{ node_config_directory }}/heat-api/:{{ container_config_directory }}/:ro"
- - "kolla_logs:/var/log/kolla/"
- run_once: True
- delegate_to: "{{ groups['heat-api'][0] }}"
+- include: bootstrap_service.yml
when: database_created
diff --git a/ansible/roles/heat/tasks/bootstrap_service.yml b/ansible/roles/heat/tasks/bootstrap_service.yml
new file mode 100644
index 000000000..40af8b175
--- /dev/null
+++ b/ansible/roles/heat/tasks/bootstrap_service.yml
@@ -0,0 +1,24 @@
+- name: Running Heat bootstrap container
+ kolla_docker:
+ action: "start_container"
+ common_options: "{{ docker_common_options }}"
+ detach: False
+ environment:
+ KOLLA_BOOTSTRAP:
+ KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
+ OS_AUTH_URL: "{{ openstack_auth.auth_url }}"
+ OS_IDENTITY_API_VERSION: "3"
+ OS_USERNAME: "{{ openstack_auth.username }}"
+ OS_PASSWORD: "{{ openstack_auth.password }}"
+ OS_PROJECT_NAME: "{{ openstack_auth.project_name }}"
+ HEAT_DOMAIN_ADMIN_PASSWORD: "{{ heat_domain_admin_password }}"
+ image: "{{ heat_api_image_full }}"
+ labels:
+ BOOTSTRAP:
+ name: "bootstrap_heat"
+ restart_policy: "never"
+ volumes:
+ - "{{ node_config_directory }}/heat-api/:{{ container_config_directory }}/:ro"
+ - "kolla_logs:/var/log/kolla/"
+ run_once: True
+ delegate_to: "{{ groups['heat-api'][0] }}"
diff --git a/ansible/roles/heat/tasks/upgrade.yml b/ansible/roles/heat/tasks/upgrade.yml
index ed97d539c..c0e3b19a4 100644
--- a/ansible/roles/heat/tasks/upgrade.yml
+++ b/ansible/roles/heat/tasks/upgrade.yml
@@ -1 +1,7 @@
---
+- include: config.yml
+
+- include: bootstrap_service.yml
+
+- include: start.yml
+ serial: "30%"