aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/haproxy.yaml
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2017-02-27 13:04:08 -0500
committerEmilien Macchi <emilien@redhat.com>2017-03-01 19:49:00 +0000
commit7c84a9b390c469e716e5802eef078d2df3902c6a (patch)
tree329861c5c0f3a8e1b04f12c7cdb7d7b7fe37ce72 /puppet/services/haproxy.yaml
parentb889a4b5b3be37ee1dabb60ddce519af84b15b22 (diff)
upgrades/validation: only run validation when services exist
During upgrades, validation test if a service is running before the upgrade process starts. In some cases, servies doesn't exist yet so we don't want to run the validation. This patch makes sure we check if the service is actually present on the system before validating it's running correctly. Also it makes sure that services are enabled before trying to stop them. It allows use-cases where we want to add new services during an upgrade. Also install new packages of services added in Ocata, so we can validate upgrades on scenarios jobs. Change-Id: Ib48fb6b1557be43956557cbde4cbe26b53a50bd8
Diffstat (limited to 'puppet/services/haproxy.yaml')
-rw-r--r--puppet/services/haproxy.yaml8
1 files changed, 8 insertions, 0 deletions
diff --git a/puppet/services/haproxy.yaml b/puppet/services/haproxy.yaml
index 7c7df34f..bd5b9ef6 100644
--- a/puppet/services/haproxy.yaml
+++ b/puppet/services/haproxy.yaml
@@ -78,14 +78,22 @@ outputs:
step_config: |
include ::tripleo::profile::base::haproxy
upgrade_tasks:
+ - name: Check if haproxy is deployed
+ command: systemctl is-enabled haproxy
+ tags: common
+ ignore_errors: True
+ register: haproxy_enabled
- name: "PreUpgrade step0,validation: Check service haproxy is running"
shell: /usr/bin/systemctl show 'haproxy' --property ActiveState | grep '\bactive\b'
+ when: haproxy_enabled.rc == 0
tags: step0,validation
- name: Stop haproxy service
tags: step2
+ when: haproxy_enabled.rc == 0
service: name=haproxy state=stopped
- name: Start haproxy service
tags: step4 # Needed at step 4 for mysql
+ when: haproxy_enabled.rc == 0
service: name=haproxy state=started
metadata_settings:
yaql: