From 8ba3a1a4ed0ce41a76fa6d712778904bb56b60ac Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Fri, 24 Nov 2017 12:10:08 +0400 Subject: Switch nofeature-ha compute nodes to UCA repo Employ UCA repo on computes nodes for nosdn-nofeature-ha scenario as well to prevent a regression (creation of ports failed for 1+n instances) of neutron ovs agent from mcp/openstack repos. Change-Id: Ie65ae122096c0d3a93c09d46191787a934bd7d4f Signed-off-by: Michael Polenchuk --- mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml | 1 - mcp/config/states/neutron_compute | 4 +--- .../0001-opendaylight-formula-neutron.patch | 22 ++++++++++++++++++++-- .../openstack_compute.yml | 1 - .../openstack/compute.yml | 1 + .../openstack/compute.yml | 1 + .../openstack/compute.yml | 13 +++++++++++++ mcp/reclass/classes/system | 2 +- 8 files changed, 37 insertions(+), 8 deletions(-) (limited to 'mcp') diff --git a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml index 0d47682c1..1766f9700 100644 --- a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml +++ b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml @@ -13,7 +13,6 @@ cluster: - virtual_control_plane - dpdk - openstack_ha - - neutron_compute - networks virtual: nodes: diff --git a/mcp/config/states/neutron_compute b/mcp/config/states/neutron_compute index f1285479e..c6b90e20d 100755 --- a/mcp/config/states/neutron_compute +++ b/mcp/config/states/neutron_compute @@ -9,6 +9,4 @@ CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x -salt -I 'neutron:compute' state.sls neutron || true -salt -I 'neutron:compute' file.append /etc/sudoers.d/neutron_sudoers \ - args='neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap-daemon /etc/neutron/rootwrap.conf' +salt -I 'neutron:compute' state.sls neutron diff --git a/mcp/patches/0001-opendaylight-formula-neutron.patch b/mcp/patches/0001-opendaylight-formula-neutron.patch index 157271aa3..8d02cd992 100644 --- a/mcp/patches/0001-opendaylight-formula-neutron.patch +++ b/mcp/patches/0001-opendaylight-formula-neutron.patch @@ -60,7 +60,7 @@ index b61e313..02da3b1 100644 +password = {{ server.backend.password }} +{%- endif %} diff --git a/neutron/files/ocata/neutron-generic.conf.Debian b/neutron/files/ocata/neutron-generic.conf.Debian -index 123386d..85b8076 100644 +index 123386d..d77f6c8 100644 --- a/neutron/files/ocata/neutron-generic.conf.Debian +++ b/neutron/files/ocata/neutron-generic.conf.Debian @@ -37,7 +37,7 @@ auth_strategy = keystone @@ -72,6 +72,15 @@ index 123386d..85b8076 100644 {% endif %} +@@ -668,7 +668,7 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf + # needs to execute commands in Dom0 in the hypervisor of XenServer, this item + # should be set to 'xenapi_root_helper', so that it will keep a XenAPI session + # to pass commands to Dom0. (string value) +-root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf ++#root_helper_daemon = + + # Seconds between nodes reporting state to server; should be less than + # agent_down_time, best if it is half or less than agent_down_time. (floating @@ -2092,3 +2092,8 @@ heartbeat_rate = 2 # Sets the list of available ciphers. value should be a string in the OpenSSL # cipher list format. (string value) @@ -82,7 +91,7 @@ index 123386d..85b8076 100644 +ovsdb_connection = {{ neutron.backend.ovsdb_connection }} +{%- endif %} diff --git a/neutron/files/ocata/neutron-server.conf.Debian b/neutron/files/ocata/neutron-server.conf.Debian -index 79376a2..c9630b8 100644 +index 79376a2..a7a4645 100644 --- a/neutron/files/ocata/neutron-server.conf.Debian +++ b/neutron/files/ocata/neutron-server.conf.Debian @@ -50,7 +50,7 @@ core_plugin = neutron.plugins.ml2.plugin.Ml2Plugin @@ -94,6 +103,15 @@ index 79376a2..c9630b8 100644 {%- if server.lbaas is defined -%},lbaasv2{%- endif -%} {%- if fwaas.get('enabled', False) -%},{{ fwaas[fwaas.api_version]['service_plugin'] }}{%- endif -%} {%- if server.get('qos', 'True') -%},neutron.services.qos.qos_plugin.QoSPlugin{%- endif -%} +@@ -703,7 +703,7 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf + # needs to execute commands in Dom0 in the hypervisor of XenServer, this item + # should be set to 'xenapi_root_helper', so that it will keep a XenAPI session + # to pass commands to Dom0. (string value) +-root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf ++#root_helper_daemon = + + # Seconds between nodes reporting state to server; should be less than + # agent_down_time, best if it is half or less than agent_down_time. (floating @@ -2245,3 +2245,8 @@ username = {{ server.identity.user }} password = {{ server.identity.password }} auth_url=http://{{ server.identity.host }}:35357 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml index a78850fc0..7163a8108 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml @@ -7,7 +7,6 @@ ############################################################################## --- classes: - - system.linux.system.repo.mcp.openstack - system.linux.system.repo.mcp.extra - system.linux.storage.loopback - system.glusterfs.client.cluster diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml index fb78d3467..4418b0fde 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml @@ -7,6 +7,7 @@ ############################################################################## --- classes: + - system.linux.system.repo.mcp.openstack - cluster.baremetal-mcp-ocata-common.openstack_compute - cluster.baremetal-mcp-ocata-odl-ha.openstack.compute_init - cluster.baremetal-mcp-ocata-odl-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml index aa6b4e34f..e610dc930 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml @@ -7,6 +7,7 @@ ############################################################################## --- classes: + - system.linux.system.repo.mcp.openstack - cluster.baremetal-mcp-ocata-common.openstack_compute - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra - system.neutron.compute.nfv.dpdk diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml index 128abb0e5..9ed3a80ea 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml @@ -10,3 +10,16 @@ classes: - cluster.baremetal-mcp-ocata-common.openstack_compute - cluster.baremetal-mcp-ocata-ovs-ha.openstack.compute_init - cluster.baremetal-mcp-ocata-ovs-ha.infra +parameters: + nova: + compute: + libvirt_service: libvirtd + libvirt_bin: /etc/default/libvirtd + linux: + system: + repo: + uca: + source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" + architectures: amd64 + key_id: EC4926EA + key_server: keyserver.ubuntu.com diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system index 4b335b98f..4edd3b5ee 160000 --- a/mcp/reclass/classes/system +++ b/mcp/reclass/classes/system @@ -1 +1 @@ -Subproject commit 4b335b98fae73d59af0eb4bf81e33369d55a94c8 +Subproject commit 4edd3b5eec839a06a3369c8c0d47bbb79681e172 -- cgit 1.2.3-korg