upgrades: deploy mod_ssl when upgrading apache
1) When Apache is upgraded, install mod_ssl rpm. See https://bugs.launchpad.net/tripleo/+bug/1682448 to understand why we need mod_ssl. 2) All services that run Apache for API will use the snippet from Apache service to deploy mod_ssl, so we don't duplicate the code in all services. It's using the same mechanism as ovs upgrade to compile upgrade_tasks between both services. Change-Id: Ia2f6fea45c2c09790c49baab19b1efcab25e9a84 Closes-Bug: #1686503
This commit is contained in:
parent
933dd62de3
commit
a6041608ca
@ -93,6 +93,12 @@ outputs:
|
|||||||
metadata_settings:
|
metadata_settings:
|
||||||
get_attr: [ApacheServiceBase, role_data, metadata_settings]
|
get_attr: [ApacheServiceBase, role_data, metadata_settings]
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
yaql:
|
||||||
|
expression: $.data.apache_upgrade + $.data.aodh_api_upgrade
|
||||||
|
data:
|
||||||
|
apache_upgrade:
|
||||||
|
get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
|
||||||
|
aodh_api_upgrade:
|
||||||
- name: Stop aodh_api service (running under httpd)
|
- name: Stop aodh_api service (running under httpd)
|
||||||
tags: step1
|
tags: step1
|
||||||
service: name=httpd state=stopped
|
service: name=httpd state=stopped
|
||||||
|
@ -112,3 +112,6 @@ outputs:
|
|||||||
shell: /usr/bin/systemctl show 'httpd' --property ActiveState | grep '\bactive\b'
|
shell: /usr/bin/systemctl show 'httpd' --property ActiveState | grep '\bactive\b'
|
||||||
when: httpd_enabled.rc == 0
|
when: httpd_enabled.rc == 0
|
||||||
tags: step0,validation
|
tags: step0,validation
|
||||||
|
- name: Ensure mod_ssl package is installed
|
||||||
|
tags: step3
|
||||||
|
yum: name=mod_ssl state=latest
|
||||||
|
@ -153,6 +153,12 @@ outputs:
|
|||||||
metadata_settings:
|
metadata_settings:
|
||||||
get_attr: [ApacheServiceBase, role_data, metadata_settings]
|
get_attr: [ApacheServiceBase, role_data, metadata_settings]
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
yaql:
|
||||||
|
expression: $.data.apache_upgrade + $.data.barbican_api_upgrade
|
||||||
|
data:
|
||||||
|
apache_upgrade:
|
||||||
|
get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
|
||||||
|
barbican_api_upgrade:
|
||||||
- name: Check if barbican_api is deployed
|
- name: Check if barbican_api is deployed
|
||||||
command: systemctl is-enabled openstack-barbican-api
|
command: systemctl is-enabled openstack-barbican-api
|
||||||
tags: common
|
tags: common
|
||||||
|
@ -100,6 +100,12 @@ outputs:
|
|||||||
metadata_settings:
|
metadata_settings:
|
||||||
get_attr: [ApacheServiceBase, role_data, metadata_settings]
|
get_attr: [ApacheServiceBase, role_data, metadata_settings]
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
yaql:
|
||||||
|
expression: $.data.apache_upgrade + $.data.ceilometer_api_upgrade
|
||||||
|
data:
|
||||||
|
apache_upgrade:
|
||||||
|
get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
|
||||||
|
ceilometer_api_upgrade:
|
||||||
- name: Stop ceilometer_api service (running under httpd)
|
- name: Stop ceilometer_api service (running under httpd)
|
||||||
tags: step1
|
tags: step1
|
||||||
service: name=httpd state=stopped
|
service: name=httpd state=stopped
|
||||||
|
@ -159,6 +159,12 @@ outputs:
|
|||||||
metadata_settings:
|
metadata_settings:
|
||||||
get_attr: [ApacheServiceBase, role_data, metadata_settings]
|
get_attr: [ApacheServiceBase, role_data, metadata_settings]
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
yaql:
|
||||||
|
expression: $.data.apache_upgrade + $.data.cinder_api_upgrade
|
||||||
|
data:
|
||||||
|
apache_upgrade:
|
||||||
|
get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
|
||||||
|
cinder_api_upgrade:
|
||||||
- name: Check if cinder_api is deployed
|
- name: Check if cinder_api is deployed
|
||||||
command: systemctl is-enabled openstack-cinder-api
|
command: systemctl is-enabled openstack-cinder-api
|
||||||
tags: common
|
tags: common
|
||||||
|
@ -133,6 +133,12 @@ outputs:
|
|||||||
metadata_settings:
|
metadata_settings:
|
||||||
get_attr: [ApacheServiceBase, role_data, metadata_settings]
|
get_attr: [ApacheServiceBase, role_data, metadata_settings]
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
yaql:
|
||||||
|
expression: $.data.apache_upgrade + $.data.gnocchi_api_upgrade
|
||||||
|
data:
|
||||||
|
apache_upgrade:
|
||||||
|
get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
|
||||||
|
gnocchi_api_upgrade:
|
||||||
- name: Stop gnocchi_api service (running under httpd)
|
- name: Stop gnocchi_api service (running under httpd)
|
||||||
tags: step1
|
tags: step1
|
||||||
service: name=httpd state=stopped
|
service: name=httpd state=stopped
|
||||||
|
@ -339,10 +339,15 @@ outputs:
|
|||||||
horizon::keystone_multidomain_support: true
|
horizon::keystone_multidomain_support: true
|
||||||
horizon::keystone_default_domain: 'Default'
|
horizon::keystone_default_domain: 'Default'
|
||||||
- {}
|
- {}
|
||||||
# Ansible tasks to handle upgrade
|
metadata_settings:
|
||||||
|
get_attr: [ApacheServiceBase, role_data, metadata_settings]
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
yaql:
|
||||||
|
expression: $.data.apache_upgrade + $.data.keystone_upgrade
|
||||||
|
data:
|
||||||
|
apache_upgrade:
|
||||||
|
get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
|
||||||
|
keystone_upgrade:
|
||||||
- name: Stop keystone service (running under httpd)
|
- name: Stop keystone service (running under httpd)
|
||||||
tags: step1
|
tags: step1
|
||||||
service: name=httpd state=stopped
|
service: name=httpd state=stopped
|
||||||
metadata_settings:
|
|
||||||
get_attr: [ApacheServiceBase, role_data, metadata_settings]
|
|
||||||
|
@ -92,6 +92,12 @@ outputs:
|
|||||||
metadata_settings:
|
metadata_settings:
|
||||||
get_attr: [ApacheServiceBase, role_data, metadata_settings]
|
get_attr: [ApacheServiceBase, role_data, metadata_settings]
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
yaql:
|
||||||
|
expression: $.data.apache_upgrade + $.data.panko_api_upgrade
|
||||||
|
data:
|
||||||
|
apache_upgrade:
|
||||||
|
get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
|
||||||
|
panko_api_upgrade:
|
||||||
- name: Check if httpd is deployed
|
- name: Check if httpd is deployed
|
||||||
command: systemctl is-enabled httpd
|
command: systemctl is-enabled httpd
|
||||||
tags: common
|
tags: common
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- When a service is deployed in WSGI with Apache, make sure mode_ssl
|
||||||
|
package is deployed during the upgrade process, it's now required
|
||||||
|
by default so Apache can start properly.
|
@ -105,6 +105,12 @@ outputs:
|
|||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::zaqar
|
include ::tripleo::profile::base::zaqar
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
yaql:
|
||||||
|
expression: $.data.apache_upgrade + $.data.zaqar_upgrade
|
||||||
|
data:
|
||||||
|
apache_upgrade:
|
||||||
|
get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
|
||||||
|
zaqar_upgrade:
|
||||||
- name: Check if zaqar is deployed
|
- name: Check if zaqar is deployed
|
||||||
command: systemctl is-enabled openstack-zaqar
|
command: systemctl is-enabled openstack-zaqar
|
||||||
tags: common
|
tags: common
|
||||||
|
Loading…
x
Reference in New Issue
Block a user