summaryrefslogtreecommitdiffstats
path: root/puppet/services/gnocchi-api.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-04 20:14:53 +0000
committerGerrit Code Review <review@openstack.org>2017-09-04 20:14:53 +0000
commit1d46899bef2b9f2453044cbc9c9ac8cdd72468ee (patch)
tree8b1ee28645a046da266e350d0d88a35f75eac15e /puppet/services/gnocchi-api.yaml
parent58251b518c4d4f3145bccd28d7ed594ed1b61a81 (diff)
parentfe975e8626b27817842eea0e4babbb7d72a919bf (diff)
Merge "Use list_concat in place of yaql" into stable/pike
Diffstat (limited to 'puppet/services/gnocchi-api.yaml')
-rw-r--r--puppet/services/gnocchi-api.yaml15
1 files changed, 6 insertions, 9 deletions
diff --git a/puppet/services/gnocchi-api.yaml b/puppet/services/gnocchi-api.yaml
index cd7ab692..0f8f352a 100644
--- a/puppet/services/gnocchi-api.yaml
+++ b/puppet/services/gnocchi-api.yaml
@@ -151,12 +151,9 @@ outputs:
metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings]
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)
- tags: step1
- service: name=httpd state=stopped
+ list_concat:
+ - get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
+ -
+ - name: Stop gnocchi_api service (running under httpd)
+ tags: step1
+ service: name=httpd state=stopped