summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mcp/config/scenario/defaults-aarch64.yaml6
-rwxr-xr-xmcp/config/states/virtual_control_plane2
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml4
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j26
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml5
5 files changed, 16 insertions, 7 deletions
diff --git a/mcp/config/scenario/defaults-aarch64.yaml b/mcp/config/scenario/defaults-aarch64.yaml
index edcd8d9ac..74bf8b116 100644
--- a/mcp/config/scenario/defaults-aarch64.yaml
+++ b/mcp/config/scenario/defaults-aarch64.yaml
@@ -14,12 +14,12 @@ virtual:
common:
apt:
keys:
- - https://linux.enea.com/mcp-repos/ocata/xenial/archive-mcpocata.key
+ - https://linux.enea.com/mcp-repos/pike/xenial/archive-mcppike.key
repos:
# <repo name> <repo prio> deb [arch=<arch>] <repo url> <repo dist> <repo comp>
- saltstack 500 deb [arch=arm64] http://linux.enea.com/saltstack/apt/ubuntu/16.04/arm64/2016.11 xenial main
- - armband_openstack 1100 deb [arch=arm64] http://linux.enea.com/mcp-repos/ocata/xenial ocata main
- - armband_mk_openstack 1100 deb [arch=arm64] http://linux.enea.com/apt-mk/xenial nightly ocata
+ - armband_openstack 1100 deb [arch=arm64] http://linux.enea.com/mcp-repos/pike/xenial pike main
+ - armband_mk_openstack 1100 deb [arch=arm64] http://linux.enea.com/apt-mk/xenial nightly pike
# NOTE(armband): Empty repo, keep commented out as reference
# - armband_mcp_extra 1100 deb [arch=arm64] http://linux.enea.com/apt-mk/xenial nightly extra
pkg:
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index 3856bef10..d92e99232 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -27,6 +27,8 @@ if [ "${ERASE_ENV}" -eq 1 ]; then
fi
# KVM libvirt first, VCP deployment
+#FIXME Should be removed once upstream patch get merged
+salt -C 'kvm*' group.add libvirtd
wait_for 5 "salt -C 'kvm*' state.sls libvirt"
salt -C 'kvm* or cmp*' state.apply salt
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml
index 3b237eb22..4f93914cf 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml
@@ -9,8 +9,8 @@
classes:
- system.linux.system.single
- cluster.all-mcp-arch-common
- # - cluster.baremetal-mcp-ocata-common-ha.stacklight
- # - cluster.baremetal-mcp-ocata-common-ha.stacklight.client
+ # - cluster.baremetal-mcp-pike-common-ha.stacklight
+ # - cluster.baremetal-mcp-pike-common-ha.stacklight.client
parameters:
_param:
apt_mk_version: nightly
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2
index cad407f57..3c51abf4a 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2
@@ -112,9 +112,11 @@ parameters:
port_type: patch
bridge: br-ex
peer: floating-to-ex
- public_ovs_interface:
+ {{ nic_public }}:
enabled: true
- name: {{ nic_public }}{% if vlan_public and vlan_public != 'native' %}.{{ vlan_public }}{% endif %}
+ {%- if vlan_public and vlan_public != 'native' %}
+ ovs_options: tag={{ vlan_public }}
+ {%- endif %}
proto: manual
ovs_port_type: OVSPort
type: ovs_port
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml
index 59bbf3869..d643da616 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml
@@ -22,6 +22,11 @@ parameters:
libvirt_bin: /etc/default/libvirtd
linux:
network:
+ dpdk_pkgs:
+ - dpdk
+ - dpdk-dev
+ - dpdk-igb-uio-dkms
+ - dpdk-rte-kni-dkms
interface:
dpdk0:
name: ${_param:dpdk0_name}