diff options
Diffstat (limited to 'mcp')
5 files changed, 32 insertions, 30 deletions
diff --git a/mcp/config/scenario/defaults-aarch64.yaml b/mcp/config/scenario/defaults-aarch64.yaml index 74bf8b116..1efa12ae4 100644 --- a/mcp/config/scenario/defaults-aarch64.yaml +++ b/mcp/config/scenario/defaults-aarch64.yaml @@ -18,10 +18,7 @@ virtual: 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/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 + - armband 1100 deb [arch=arm64] http://linux.enea.com/mcp-repos/pike/xenial pike-armband main pkg: install: - linux-image-generic-hwe-16.04-edge diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane index d92e99232..3856bef10 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -27,8 +27,6 @@ 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/patches/0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch b/mcp/patches/0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch new file mode 100644 index 000000000..1ac6cd157 --- /dev/null +++ b/mcp/patches/0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch @@ -0,0 +1,21 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Sun, 20 Aug 2017 02:03:01 +0200 +Subject: [PATCH] libvirt: unix_sock_group: s/libvirtd/libvirt/ + +For Pike, libvirt 3.x is used, which uses "libvirt" by default. + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + +diff --git a/libvirt/files/libvirtd.conf.Debian b/libvirt/files/libvirtd.conf.Debian +--- a/libvirt/files/libvirtd.conf.Debian ++++ b/libvirt/files/libvirtd.conf.Debian +@@ -81,7 +81,7 @@ + # without becoming root. + # + # This is restricted to 'root' by default. +-unix_sock_group = "libvirtd" ++unix_sock_group = "libvirt" + + # Set the UNIX socket permissions for the R/O socket. This is used + # for monitoring VM status only diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list index fcbd3ae88..00b1145d8 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -16,3 +16,4 @@ /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch /usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch +/usr/share/salt-formulas/env: 0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch 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 3c51abf4a..cee41700e 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 @@ -27,8 +27,6 @@ {%- set vlan_mgmt = conf['net_config']['mgmt']['vlan'] -%} {%- set vlan_private = conf['net_config']['private']['vlan'] -%} {%- set vlan_public = conf['net_config']['public']['vlan'] -%} - - {%- set gateway_public = conf['net_config']['public']['gateway'] -%} {%- else -%} {%- set nic_admin = 'enp6s0' -%} {%- set nic_mgmt = 'enp6s0' -%} @@ -40,9 +38,9 @@ {%- endif -%} {#- Filter-out NIC duplicates by constructing a dict (used NICs only) -#} -{%- set nics = { nic_admin: True, nic_mgmt: True, nic_public: True} -%} +{%- set nics = { nic_admin: True, nic_mgmt: True } -%} -{%- set vlans = { vlan_admin: nic_admin, vlan_mgmt: nic_mgmt, vlan_public: nic_public} -%} +{%- set vlans = { vlan_admin: nic_admin, vlan_mgmt: nic_mgmt } -%} --- parameters: linux: @@ -94,31 +92,18 @@ parameters: mtu: ${_param:interface_mtu} br-ex: enabled: true - type: ovs_bridge - mtu: ${_param:interface_mtu} - address: ${_param:external_address} - netmask: 255.255.255.0 - proto: static - gateway: {{ gateway_public }} - floating-to-ex: - enabled: true type: ovs_port - port_type: patch bridge: br-floating - peer: ex-to-floating - ex-to-floating: - enabled: true - type: ovs_port - port_type: patch - bridge: br-ex - peer: floating-to-ex - {{ nic_public }}: - enabled: true + proto: static {%- if vlan_public and vlan_public != 'native' %} ovs_options: tag={{ vlan_public }} {%- endif %} + address: ${_param:external_address} + netmask: 255.255.255.0 + {{ nic_public }}: + enabled: true proto: manual ovs_port_type: OVSPort type: ovs_port - ovs_bridge: br-ex - bridge: br-ex + ovs_bridge: br-floating + bridge: br-floating |