Merge "Pass the DOCKER_* env vars when running docker"

[apex-tripleo-heat-templates.git] / puppet / services / neutron-ovs-agent.yaml

diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml
index c27bb90..01471ba 100644 (file)
--- a/puppet/services/neutron-ovs-agent.yaml
+++ b/puppet/services/neutron-ovs-agent.yaml
@@ -121,9 +121,16 @@ outputs:
       step_config: |
         include ::tripleo::profile::base::neutron::ovs
       upgrade_tasks:
+        - name: Check if neutron_ovs_agent is deployed
+          command: systemctl is-enabled neutron-openvswitch-agent
+          tags: common
+          ignore_errors: True
+          register: neutron_ovs_agent_enabled
         - name: "PreUpgrade step0,validation: Check service neutron-openvswitch-agent is running"
           shell: /usr/bin/systemctl show 'neutron-openvswitch-agent' --property ActiveState | grep '\bactive\b'
+          when: neutron_ovs_agent_enabled.rc == 0
           tags: step0,validation
         - name: Stop neutron_ovs_agent service
-          tags: step2
+          tags: step1
+          when: neutron_ovs_agent_enabled.rc == 0
           service: name=neutron-openvswitch-agent state=stopped