AArch64: s/ocata/pike/g in scenario defaults

We hard set some repo URLs used for base image pre-building, so bump
those to Pike, now that Armband repos for Pike are populated.

JIRA: ARMBAND-335

Change-Id: Ibd7267b628985a3c7a33d9d8a93c824077c69f10
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/mcp/config/scenario/defaults-aarch64.yaml b/mcp/config/scenario/defaults-aarch64.yaml
index edcd8d9..74bf8b1 100644 (file)
--- 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/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 164d90c..bf88816 100644 (file)
--- 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