diff options
Diffstat (limited to 'mcp')
8 files changed, 20 insertions, 16 deletions
diff --git a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml index 7e0739037..46c8bddc1 100644 --- a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml +++ b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml @@ -34,10 +34,10 @@ virtual: threads: 2 numa: cell0: - memory: 4194304 + memory: 8388608 cpus: 0-3 cell1: - memory: 4194304 + memory: 8388608 cpus: 4-7 cmp002: vcpus: 8 @@ -48,8 +48,8 @@ virtual: threads: 2 numa: cell0: - memory: 4194304 + memory: 8388608 cpus: 0-3 cell1: - memory: 4194304 + memory: 8388608 cpus: 4-7 diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index 0f6858f1e..499c1d357 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -82,7 +82,3 @@ dashboard_host=$(salt -C 'I@nginx:server and *01*' --out=yaml cp.push \ upload_path='certs/os_cacert' | cut -d':' -f1) cd /etc/ssl/certs && \ ln -sf "/var/cache/salt/master/minions/${dashboard_host}/files/certs/os_cacert" - -# glance v1 api is required by orchestra tests -salt -I 'glance:server' ini.set_option /etc/glance/glance-api.conf '{DEFAULT: {enable_v1_api: True}}' -salt -I 'glance:server' service.restart glance-api 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" diff --git a/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/single.yml b/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/single.yml index 3a762b39a..82c141e87 100644 --- a/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/single.yml +++ b/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/single.yml @@ -10,11 +10,11 @@ applications: - opendaylight parameters: _param: - version: oxygen + opendaylight_version: fluorine opendaylight: server: enabled: 'True' - version: ${_param:version} - repo: 'odl-team/${_param:version}' + version: ${_param:opendaylight_version} + repo: 'odl-team/${_param:opendaylight_version}' logging: engine: syslog diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index 34229df08..df35f3706 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -497,7 +497,7 @@ function prepare_containers { docker-compose --version > /dev/null 2>&1 || COMPOSE_PREFIX="${image_dir}/" "${COMPOSE_PREFIX}docker-compose" -f docker-compose/docker-compose.yaml down - if [ ! "${MCP_DOCKER_TAG}" = 'verify' ]; then + if [[ ! "${MCP_DOCKER_TAG}" =~ 'verify' ]]; then "${COMPOSE_PREFIX}docker-compose" -f docker-compose/docker-compose.yaml pull fi sudo rm -rf "${image_dir}/"{salt,hosts,pki} "${image_dir}/nodes/"* |