diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-03-02 20:24:18 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-03-02 20:24:18 +0000 |
commit | 5b8cab7cfdec7aa324ed1b57f2795c9eca3baae4 (patch) | |
tree | 2dec51bb12ecfe9e49c26851767ea2b3235faa26 /puppet/services/neutron-dhcp.yaml | |
parent | 6eba4325246351b96996e871aeeab56a03590209 (diff) | |
parent | 53225d57b1c4e3de722f9cdc25eefa9a3dec1e97 (diff) |
Merge "upgrades/validation: only run validation when services exist" into stable/ocata
Diffstat (limited to 'puppet/services/neutron-dhcp.yaml')
-rw-r--r-- | puppet/services/neutron-dhcp.yaml | 7 |
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 |