Merge "Fix Hypervisor libvirt interference with docker libvirt" into …

…OSPD16
nuagenetworks · Mar 24, 2021 · ff525fd · ff525fd
2 parents e0fb562 + b918842
commit ff525fd
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 0 deletions.
diff --git a/image-patching/nuage_image_patching_scripts/nuage_overcloud_full_patch.py b/image-patching/nuage_image_patching_scripts/nuage_overcloud_full_patch.py
@@ -71,6 +71,16 @@ def install_nuage_packages():
 ''' % (constants.NUAGE_DEPENDENCIES, constants.NUAGE_VRS_PACKAGE,
        constants.NUAGE_PACKAGES)
     constants.PATCHING_SCRIPT += cmds + '\n'
+    # Disable the libvirt service
+    #   Otherwise after a reboot of the overcloud hypervisor
+    #   the libvirtd service will be interfering with the overcloud
+    #   libvirt container.
+    #   Libvirt is needed on overcloud for VRS to get vm-node
+    constants.PATCHING_SCRIPT += (
+        "systemctl disable libvirtd; "
+        "systemctl stop libvirtd \n"
+    )
+
 
 
 #####

diff --git a/nuage-tripleo-heat-templates/deployment/nova/neutron-compute-plugin-nuage.yaml b/nuage-tripleo-heat-templates/deployment/nova/neutron-compute-plugin-nuage.yaml
@@ -191,6 +191,16 @@ outputs:
                     - nuage-puppet-modules
                     - selinux-policy-nuage
                     - nuage-bgp
+              - name: Ensure libvirtd is not active on compute (outside of nova container)
+                # Disable the libvirt service
+                #   Otherwise after a reboot of the overcloud hypervisor
+                #   the libvirtd service will be interfering with the overcloud
+                #   libvirt container.
+                #   Libvirt is needed on overcloud for VRS to get vm-node
+                service:
+                  name: libvirtd
+                  state: stopped
+                  enabled: no
               when: nuage_base_check.rc != 0
         - when: step|int == 2
           block:

diff --git a/nuage-tripleo-heat-templates/deployment/nova/nuage-compute-avrs.yaml b/nuage-tripleo-heat-templates/deployment/nova/nuage-compute-avrs.yaml
@@ -229,6 +229,16 @@ outputs:
                         - qemu-kvm
                         - libvirt
                         - python3-libvirt
+                  - name: Ensure libvirtd is not active on compute (outside of nova container)
+                    # Disable the libvirt service
+                    #   Otherwise after a reboot of the overcloud hypervisor
+                    #   the libvirtd service will be interfering with the overcloud
+                    #   libvirt container.
+                    #   Libvirt is needed on overcloud for VRS to get vm-node
+                    service:
+                      name: libvirtd
+                      state: stopped
+                      enabled: no
                   - name: install virtual-accelerator-base
                     yum:
                       name: virtual-accelerator-base