CentOS: Use modular libvirt for all scenarios
Now modular libvirt is the recommended architecture in RHEL/CentOS 9, and we switched the default in Red Hat family operating systems to use it. Depends-on: https://review.opendev.org/920722 Change-Id: I043ef1b13a9dd3f694b740841b7e8628e5b95ac7
This commit is contained in:
		@@ -23,12 +23,10 @@ if $facts['os']['name'] == 'Ubuntu' {
 | 
				
			|||||||
case $facts['os']['family'] {
 | 
					case $facts['os']['family'] {
 | 
				
			||||||
  'Debian': {
 | 
					  'Debian': {
 | 
				
			||||||
    $ipv6 = false
 | 
					    $ipv6 = false
 | 
				
			||||||
    $modular_libvirt = false
 | 
					 | 
				
			||||||
    $ovn_metadata_agent_enabled = true
 | 
					    $ovn_metadata_agent_enabled = true
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  'RedHat': {
 | 
					  'RedHat': {
 | 
				
			||||||
    $ipv6 = true
 | 
					    $ipv6 = true
 | 
				
			||||||
    $modular_libvirt = true
 | 
					 | 
				
			||||||
    $ovn_metadata_agent_enabled = false
 | 
					    $ovn_metadata_agent_enabled = false
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  default: {
 | 
					  default: {
 | 
				
			||||||
@@ -62,7 +60,6 @@ class { 'openstack_integration::neutron':
 | 
				
			|||||||
include openstack_integration::placement
 | 
					include openstack_integration::placement
 | 
				
			||||||
class { 'openstack_integration::nova':
 | 
					class { 'openstack_integration::nova':
 | 
				
			||||||
  cinder_enabled         => true,
 | 
					  cinder_enabled         => true,
 | 
				
			||||||
  modular_libvirt        => $modular_libvirt,
 | 
					 | 
				
			||||||
  libvirt_guests_enabled => true,
 | 
					  libvirt_guests_enabled => true,
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
class { 'openstack_integration::octavia':
 | 
					class { 'openstack_integration::octavia':
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user