Merge "Add validation task in docker services [Neutron]"

docker/services/neutron-api.yaml

@@ -169,12 +169,12 @@ outputs:
       host_prep_tasks: {get_attr: [NeutronLogging, host_prep_tasks]}
       upgrade_tasks:
         - name: Check if neutron_server is deployed
-          command: systemctl is-enabled neutron-server
+          command: systemctl is-enabled --quiet neutron-server
           tags: common
           ignore_errors: True
           register: neutron_server_enabled
         - name: "PreUpgrade step0,validation: Check service neutron-server is running"
-          shell: /usr/bin/systemctl show 'neutron-server' --property ActiveState | grep '\bactive\b'
+          command: systemctl is-active --quiet neutron-server
           when: neutron_server_enabled.rc == 0
           tags: step0,validation
         - name: Stop and disable neutron_api service

docker/services/neutron-dhcp.yaml

@@ -120,12 +120,12 @@ outputs:
                 state: directory
       upgrade_tasks:
         - name: Check if neutron_dhcp_agent is deployed
-          command: systemctl is-enabled neutron-dhcp-agent
+          command: systemctl is-enabled --quiet 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'
+          command: systemctl is-active --quiet neutron-dhcp-agent
           when: neutron_dhcp_agent_enabled.rc == 0
           tags: step0,validation
         - name: Stop and disable neutron_dhcp service

docker/services/neutron-l3.yaml

@@ -117,7 +117,16 @@ outputs:
                 path: /var/lib/neutron
                 state: directory
       upgrade_tasks:
+        - name: Check if neutron_l3_agent is deployed
+          command: systemctl is-enabled --quiet neutron-l3-agent
+          tags: common
+          ignore_errors: True
+          register: neutron_l3_agent_enabled
+        - name: "PreUpgrade step0,validation: Check service neutron-l3-agent is running"
+          command: systemctl is-active --quiet neutron-l3-agent
+          when: neutron_l3_agent_enabled.rc == 0
+          tags: step0,validation
         - name: Stop and disable neutron_l3 service
           tags: step2
+          when: neutron_l3_agent_enabled.rc == 0
           service: name=neutron-l3-agent state=stopped enabled=no
-

docker/services/neutron-metadata.yaml

@@ -118,12 +118,12 @@ outputs:
                 state: directory
       upgrade_tasks:
         - name: Check if neutron_metadata_agent is deployed
-          command: systemctl is-enabled neutron-metadata-agent
+          command: systemctl is-enabled --quiet neutron-metadata-agent
           tags: common
           ignore_errors: True
           register: neutron_metadata_agent_enabled
         - name: "PreUpgrade step0,validation: Check service neutron-metadata-agent is running"
-          shell: /usr/bin/systemctl show 'neutron-metadata-agent' --property ActiveState | grep '\bactive\b'
+          command: systemctl is-active --quiet neutron-metadata-agent
           when: neutron_metadata_agent_enabled.rc == 0
           tags: step0,validation
         - name: Stop and disable neutron_metadata service

docker/services/neutron-ovs-agent.yaml

@@ -142,8 +142,18 @@ outputs:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks: {get_attr: [NeutronLogging, host_prep_tasks]}
       upgrade_tasks:
+        - name: Check if neutron_ovs_agent is deployed
+          command: systemctl is-enabled --quiet neutron-openvswitch-agent
+          tags: common
+          ignore_errors: True
+          register: neutron_ovs_agent_enabled
+        - name: "PreUpgrade step0,validation: Check service neutron-openvswitch-agent is running"
+          command: systemctl is-active --quiet neutron-openvswitch-agent
+          when: neutron_ovs_agent_enabled.rc == 0
+          tags: step0,validation
         - name: Stop and disable neutron_ovs_agent service
           tags: step2
+          when: neutron_ovs_agent_enabled.rc == 0
           service: name=neutron-openvswitch-agent state=stopped enabled=no
         - name: Remove openstack-neutron-openvswitch package if operator requests it
           yum: name=openstack-neutron-openvswitch state=removed

docker/services/neutron-sriov-agent.yaml

@@ -104,6 +104,16 @@ outputs:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks: {get_attr: [NeutronLogging, host_prep_tasks]}
       upgrade_tasks:
+        - name: Check if neutron_sriov_nic_agent is deployed
+          command: systemctl is-enabled --quiet neutron-sriov-nic-agent
+          tags: common
+          ignore_errors: True
+          register: neutron_sriov_nic_agent_enabled
+        - name: "PreUpgrade step0,validation: Check service neutron-sriov-nic-agent is running"
+          command: systemctl is-active --quiet neutron-sriov-nic-agent
+          when: neutron_sriov_nic_agent_enabled.rc == 0
+          tags: step0,validation
         - name: Stop and disable neutron_sriov_agent service
           tags: step2
+          when: neutron_sriov_nic_agent_enabled.rc == 0
           service: name=neutron-sriov-nic-agent state=stopped enabled=no