From 8ba3a1a4ed0ce41a76fa6d712778904bb56b60ac Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
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 <mpolenchuk@mirantis.com>
---
 .../baremetal-mcp-ocata-common/openstack_compute.yml        |  1 -
 .../baremetal-mcp-ocata-odl-ha/openstack/compute.yml        |  1 +
 .../baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml   |  1 +
 .../baremetal-mcp-ocata-ovs-ha/openstack/compute.yml        | 13 +++++++++++++
 mcp/reclass/classes/system                                  |  2 +-
 5 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'mcp/reclass/classes')

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