From 53225d57b1c4e3de722f9cdc25eefa9a3dec1e97 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 27 Feb 2017 13:04:08 -0500 Subject: 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 (cherry picked from commit 7c84a9b390c469e716e5802eef078d2df3902c6a) --- puppet/services/ec2-api.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'puppet/services/ec2-api.yaml') diff --git a/puppet/services/ec2-api.yaml b/puppet/services/ec2-api.yaml index 090e0c4d..70821396 100644 --- a/puppet/services/ec2-api.yaml +++ b/puppet/services/ec2-api.yaml @@ -118,7 +118,7 @@ outputs: upgrade_tasks: - name: Check if ec2-api is deployed command: systemctl is-enabled openstack-ec2-api - tags: step0,validation + tags: common ignore_errors: True register: ec2_api_enabled - name: "PreUpgrade step0,validation: Check if openstack-ec2-api is running" @@ -129,5 +129,10 @@ outputs: tags: step0,validation - name: Stop openstack-ec2-api service tags: step1 + when: ec2_api_enabled.rc == 0 service: name=openstack-ec2-api state=stopped + - name: Install openstack-ec2-api package if it was disabled + tags: step3 + yum: name=openstack-ec2-api state=latest + when: ec2_api_enabled.rc != 0 -- cgit 1.2.3-korg