openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Adds fast_forward_upgrade_tasks for Heat services"

This commit is contained in:
Zuul 2018-03-16 23:35:08 +00:00 committed by Gerrit Code Review
parent 3253bba691 fa66d68c08
commit 78af246b66
11 changed files with 103 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
docker/services/heat-api-cfn.yaml
View File

@ -173,3 +173,23 @@ outputs:
- httpd_running.rc == 0
metadata_settings:
get_attr: [HeatBase, role_data, metadata_settings]
fast_forward_upgrade_tasks:
- name: FFU check if openstack-heat-api-cfn service is enabled
command: systemctl is-enabled openstack-heat-api-cfn
ignore_errors: True
register: heat_api_cfn_enabled_result
when:
- step|int == 0
- release == 'ocata'
- name: Set fact heat_api_cfn_enabled
set_fact:
heat_api_cfn_enabled: "{{ heat_api_cfn_enabled_result.rc == 0 }}"
when:
- step|int == 0
- release == 'ocata'
- name: FFU stop and disable openstack-heat-api-cfn service
when:
- step|int == 1
- release == 'ocata'
- heat_api_cfn_enabled|bool
service: name=openstack-heat-api-cfn state=stopped enabled=no

30
docker/services/heat-api.yaml
View File

@ -216,3 +216,33 @@ outputs:
state: absent
metadata_settings:
get_attr: [HeatBase, role_data, metadata_settings]
fast_forward_upgrade_tasks:
- name: FFU check openstack-heat-api is enabled
command: systemctl is-enabled openstack-heat-api
ignore_errors: True
register: heat_api_enabled_result
when:
- step|int == 0
- release == 'ocata'
- name: Set fact heat_api_enabled
set_fact:
heat_api_enabled: "{{ heat_api_enabled_result.rc == 0 }}"
when:
- step|int == 0
- release == 'ocata'
- name: FFU stop and disable openstack-heat-api
service: name=openstack-heat-api state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- heat_api_enabled|bool
- name: FFU Heat package update
yum: name=openstack-heat* state=latest
when:
- step|int == 6
- is_bootstrap_node|bool
- name: FFU Heat db-sync
command: heat-manage db_sync
when:
- step|int == 8
- is_bootstrap_node|bool

20
docker/services/heat-engine.yaml
View File

@ -150,3 +150,23 @@ outputs:
- step|int == 2
- heat_engine_enabled.rc == 0
service: name=openstack-heat-engine state=stopped enabled=no
fast_forward_upgrade_tasks:
- name: FFU check if openstack-heat-engine is enabled
command: systemctl is-enabled --quiet openstack-heat-engine
ignore_errors: True
register: heat_engine_enabled_result
when:
- step|int == 0
- release == 'ocata'
- name: Set fact heat_engine_enabled
set_fact:
heat_engine_enabled: "{{ heat_engine_enabled_result.rc == 0 }}"
when:
- step|int == 0
- release == 'ocata'
- name: FFU stop and disable openstack-heat-engine service
when:
- step|int == 1
- release == 'ocata'
- heat_engine_enabled|bool
service: name=openstack-heat-engine state=stopped enabled=no

26
puppet/services/disabled/heat-api-cloudwatch-disabled.yaml
View File

@ -47,3 +47,29 @@ outputs:
- step|int == 1
- heat_api_cloudwatch_enabled.rc == 0
service: name=openstack-heat-api-cloudwatch state=stopped enabled=no
fast_forward_upgrade_tasks:
- name: FFU check if heat_api_cloudwatch is deployed
command: systemctl is-enabled openstack-heat-api-cloudwatch
ignore_errors: True
register: heat_api_cloudwatch_enabled_result
when:
- step|int == 0
- release == 'ocata'
- name: Set fact heat_api_cloudwatch_enabled
set_fact:
heat_api_cloudwatch_enabled: "{{ heat_api_cloudwatch_enabled_result.rc == 0 }}"
when:
- step|int == 0
- release == 'ocata'
- name: FFU stop and disable the heat-api-cloudwatch service.
service: name=openstack-heat-api-cloudwatch state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- heat_api_cloudwatch_enabled|bool
- name: Remove heat_api_cloudwatch package
yum: name=openstack-heat-api-cloudwatch state=removed
ignore_errors: True
when:
- step|int == 2
- release == 'ocata'

1
roles/Controller.yaml
View File

@ -79,6 +79,7 @@
- OS::TripleO::Services::GnocchiStatsd
- OS::TripleO::Services::HAproxy
- OS::TripleO::Services::HeatApi
- OS::TripleO::Services::HeatApiCloudwatch
- OS::TripleO::Services::HeatApiCfn
- OS::TripleO::Services::HeatEngine
- OS::TripleO::Services::Horizon

1
roles/ControllerAllNovaStandalone.yaml
View File

@ -55,6 +55,7 @@
- OS::TripleO::Services::GnocchiStatsd
- OS::TripleO::Services::HAproxy
- OS::TripleO::Services::HeatApi
- OS::TripleO::Services::HeatApiCloudwatch
- OS::TripleO::Services::HeatApiCfn
- OS::TripleO::Services::HeatEngine
- OS::TripleO::Services::Horizon

1
roles/ControllerNoCeph.yaml
View File

@ -72,6 +72,7 @@
- OS::TripleO::Services::GnocchiStatsd
- OS::TripleO::Services::HAproxy
- OS::TripleO::Services::HeatApi
- OS::TripleO::Services::HeatApiCloudwatch
- OS::TripleO::Services::HeatApiCfn
- OS::TripleO::Services::HeatEngine
- OS::TripleO::Services::Horizon

1
roles/ControllerNovaStandalone.yaml
View File

@ -64,6 +64,7 @@
- OS::TripleO::Services::GnocchiStatsd
- OS::TripleO::Services::HAproxy
- OS::TripleO::Services::HeatApi
- OS::TripleO::Services::HeatApiCloudwatch
- OS::TripleO::Services::HeatApiCfn
- OS::TripleO::Services::HeatEngine
- OS::TripleO::Services::Horizon

1
roles/ControllerOpenstack.yaml
View File

@ -60,6 +60,7 @@
- OS::TripleO::Services::GnocchiStatsd
- OS::TripleO::Services::HAproxy
- OS::TripleO::Services::HeatApi
- OS::TripleO::Services::HeatApiCloudwatch
- OS::TripleO::Services::HeatApiCfn
- OS::TripleO::Services::HeatEngine
- OS::TripleO::Services::Horizon

1
roles/ControllerStorageNfs.yaml
View File

@ -73,6 +73,7 @@
- OS::TripleO::Services::GnocchiStatsd
- OS::TripleO::Services::HAproxy
- OS::TripleO::Services::HeatApi
- OS::TripleO::Services::HeatApiCloudwatch
- OS::TripleO::Services::HeatApiCfn
- OS::TripleO::Services::HeatEngine
- OS::TripleO::Services::Horizon

1
roles_data.yaml
View File

@ -82,6 +82,7 @@
- OS::TripleO::Services::GnocchiStatsd
- OS::TripleO::Services::HAproxy
- OS::TripleO::Services::HeatApi
- OS::TripleO::Services::HeatApiCloudwatch
- OS::TripleO::Services::HeatApiCfn
- OS::TripleO::Services::HeatEngine
- OS::TripleO::Services::Horizon