summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-02 14:01:32 +0000
committerGerrit Code Review <review@openstack.org>2017-03-02 14:01:32 +0000
commite82e8d23abcfec94d2dbb633b2d5ecd136d4b201 (patch)
tree218bcdb49e57340490cceea44a78a8bc8b399f51 /puppet/services
parentebd73c0b0950b2823ce17acae76ff87a8246675d (diff)
parent7273a3de0296f6f75d4d549f72645ca916d967de (diff)
Merge "Add upgrade task for panko api"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/panko-api.yaml19
1 files changed, 14 insertions, 5 deletions
diff --git a/puppet/services/panko-api.yaml b/puppet/services/panko-api.yaml
index fc127a27..254d7c24 100644
--- a/puppet/services/panko-api.yaml
+++ b/puppet/services/panko-api.yaml
@@ -85,8 +85,17 @@ outputs:
metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings]
upgrade_tasks:
- # The panko API isn't installed in newton images, so install
- # it on upgrade
- - name: Install openstack-panko-api packages on upgrade
- tags: step3
- yum: name=openstack-panko-api state=latest
+ - name: Check if httpd is deployed
+ command: systemctl is-enabled httpd
+ tags: step0,validation
+ ignore_errors: True
+ register: httpd_enabled
+ - name: "PreUpgrade step0,validation: Check if httpd is running"
+ shell: >
+ /usr/bin/systemctl show 'httpd' --property ActiveState |
+ grep '\bactive\b'
+ when: httpd_enabled.rc == 0
+ tags: step0,validation
+ - name: Stop panko-api service (running under httpd)
+ tags: step1
+ service: name=httpd state=stopped