aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/neutron-dhcp.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/neutron-dhcp.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/neutron-dhcp.yaml')
-rw-r--r--puppet/services/neutron-dhcp.yaml7
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/services/neutron-dhcp.yaml b/puppet/services/neutron-dhcp.yaml
index b31933f6..fe7f9f31 100644
--- a/puppet/services/neutron-dhcp.yaml
+++ b/puppet/services/neutron-dhcp.yaml
@@ -80,9 +80,16 @@ outputs:
step_config: |
include tripleo::profile::base::neutron::dhcp
upgrade_tasks:
+ - name: Check if neutron_dhcp_agent is deployed
+ command: systemctl is-enabled neutron-dhcp-agent
+ tags: common
+ ignore_errors: True
+ register: neutron_dhcp_agent_enabled
- name: "PreUpgrade step0,validation: Check service neutron-dhcp-agent is running"
shell: /usr/bin/systemctl show 'neutron-dhcp-agent' --property ActiveState | grep '\bactive\b'
+ when: neutron_dhcp_agent_enabled.rc == 0
tags: step0,validation
- name: Stop neutron_dhcp service
tags: step1
+ when: neutron_dhcp_agent_enabled.rc == 0
service: name=neutron-dhcp-agent state=stopped