X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fneutron-l3.yaml;h=cd9870bd9fff3db29ba8cddee2b1d3673038631d;hb=0162749f71c6831f3078ef2c7277f208aac05042;hp=4fa492755a56825f298bf5d2468581a21e27bbbd;hpb=1fcae324219a77d74fa12fb9eaac400a0658cac4;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/neutron-l3.yaml b/puppet/services/neutron-l3.yaml
index 4fa49275..cd9870bd 100644
--- a/puppet/services/neutron-l3.yaml
+++ b/puppet/services/neutron-l3.yaml
@@ -85,9 +85,16 @@ outputs:
       step_config: |
         include tripleo::profile::base::neutron::l3
       upgrade_tasks:
+        - name: Check if neutron_l3_agent is deployed
+          command: systemctl is-enabled neutron-l3-agent
+          tags: common
+          ignore_errors: True
+          register: neutron_l3_agent_enabled
         - name: "PreUpgrade step0,validation: Check service neutron-l3-agent is running"
           shell: /usr/bin/systemctl show 'neutron-l3-agent' --property ActiveState | grep '\bactive\b'
+          when: neutron_l3_agent_enabled.rc == 0
           tags: step0,validation
         - name: Stop neutron_l3 service
-          tags: step2
+          tags: step1
+          when: neutron_l3_agent_enabled.rc == 0
           service: name=neutron-l3-agent state=stopped