Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Remove package if service stopped and disabled" into stable/pike
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
sahara-api.yaml
diff --git
a/docker/services/sahara-api.yaml
b/docker/services/sahara-api.yaml
index
bff2fda
..
cf7eae8
100644
(file)
--- a/
docker/services/sahara-api.yaml
+++ b/
docker/services/sahara-api.yaml
@@
-36,12
+36,19
@@
parameters:
default: {}
description: Parameters specific to the role
type: json
default: {}
description: Parameters specific to the role
type: json
+ UpgradeRemoveUnusedPackages:
+ default: false
+ description: Remove package if the service is being disabled during upgrade
+ type: boolean
resources:
ContainersCommon:
type: ./containers-common.yaml
resources:
ContainersCommon:
type: ./containers-common.yaml
+ MySQLClient:
+ type: ../../puppet/services/database/mysql-client.yaml
+
SaharaApiPuppetBase:
type: ../../puppet/services/sahara-api.yaml
properties:
SaharaApiPuppetBase:
type: ../../puppet/services/sahara-api.yaml
properties:
@@
-59,8
+66,13
@@
outputs:
map_merge:
- get_attr: [SaharaApiPuppetBase, role_data, config_settings]
- sahara::sync_db: false
map_merge:
- get_attr: [SaharaApiPuppetBase, role_data, config_settings]
- sahara::sync_db: false
+ logging_source: {get_attr: [SaharaApiPuppetBase, role_data, logging_source]}
+ logging_groups: {get_attr: [SaharaApiPuppetBase, role_data, logging_groups]}
step_config: &step_config
step_config: &step_config
- get_attr: [SaharaApiPuppetBase, role_data, step_config]
+ list_join:
+ - "\n"
+ - - {get_attr: [SaharaApiPuppetBase, role_data, step_config]}
+ - {get_attr: [MySQLClient, role_data, step_config]}
service_config_settings: {get_attr: [SaharaApiPuppetBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS #
puppet_config:
service_config_settings: {get_attr: [SaharaApiPuppetBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS #
puppet_config:
@@
-130,3
+142,8
@@
outputs:
- name: Stop and disable sahara_api service
tags: step2
service: name=openstack-sahara-api state=stopped enabled=no
- name: Stop and disable sahara_api service
tags: step2
service: name=openstack-sahara-api state=stopped enabled=no
+ - name: Remove openstack-sahara-api package if operator requests it
+ yum: name=openstack-sahara-api state=removed
+ tags: step2
+ ignore_errors: True
+ when: {get_param: UpgradeRemoveUnusedPackages}