diff options
Diffstat (limited to 'mcp/reclass/classes')
4 files changed, 12 insertions, 4 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 index a518c6e11..120fc9ff7 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 @@ -153,9 +153,6 @@ parameters: listen: heat_cloudwatch_api: enabled: false - neutron_api: - # Set source balancing - type: heat barbican: server: ks_notifications_enable: true diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 index dc286452b..79eafcd10 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 @@ -256,7 +256,7 @@ parameters: pin: - pin: 'release o=Canonical' priority: 1200 - package: 'python-pymysql libvirt* *qemu*' + package: 'libvirt* qemu* openvswitch* python-openvswitch ovn* dpdk* libdpdk*' {%- if 'aarch64' in nm.cluster.arch %} armband_3: # Should be in sync with the repo config generated via curtin/MaaS source: "deb http://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-armband main" diff --git a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2 index 767b30849..2707c7f5e 100644 --- a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2 @@ -11,6 +11,7 @@ --- classes: - service.neutron.compute.single + - system.nova.compute.nfv.hugepages - cluster.mcp-common-noha.openstack_compute - cluster.mcp-ovs-noha parameters: @@ -30,3 +31,7 @@ parameters: netmask: ${_param:opnfv_net_private_mask} use_interfaces: - {{ ma.interface_str(nm.cmp001.nic_private, vlan_private_start) }} + system: + package: + cgroup-tools: + version: latest diff --git a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/control.yml index 939cb2834..dd0245344 100644 --- a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/control.yml @@ -10,3 +10,9 @@ classes: - system.neutron.control.openvswitch.single - cluster.mcp-common-noha.openstack_control - cluster.mcp-ovs-noha +parameters: + nova: + controller: + scheduler_default_filters: "DifferentHostFilter,SameHostFilter,RetryFilter,AvailabilityZoneFilter,RamFilter,\ + CoreFilter,DiskFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,\ + ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,NUMATopologyFilter" |