diff options
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/etcd.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/panko-api.yaml | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/puppet/services/etcd.yaml b/puppet/services/etcd.yaml index ec87a75a..7cdd8451 100644 --- a/puppet/services/etcd.yaml +++ b/puppet/services/etcd.yaml @@ -36,7 +36,7 @@ outputs: etcd::etcd_name: str_replace: template: - '"%{::fqdn_$NETWORK}"' + "%{hiera('fqdn_$NETWORK')}" params: $NETWORK: {get_param: [ServiceNetMap, EtcdNetwork]} # NOTE: bind IP is found in Heat replacing the network name with the local node IP diff --git a/puppet/services/panko-api.yaml b/puppet/services/panko-api.yaml index 254d7c24..eed98257 100644 --- a/puppet/services/panko-api.yaml +++ b/puppet/services/panko-api.yaml @@ -87,7 +87,7 @@ outputs: upgrade_tasks: - name: Check if httpd is deployed command: systemctl is-enabled httpd - tags: step0,validation + tags: common ignore_errors: True register: httpd_enabled - name: "PreUpgrade step0,validation: Check if httpd is running" @@ -99,3 +99,7 @@ outputs: - name: Stop panko-api service (running under httpd) tags: step1 service: name=httpd state=stopped + when: httpd_enabled.rc == 0 + - name: Install openstack-panko-api package if it was not installed + tags: step3 + yum: name=openstack-panko-api state=latest |