summaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-11 19:40:11 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-11 19:40:11 +0000
commite9cce3a7cb13b00c631518a53e85ea90dd654ac4 (patch)
tree96d09f6a73b3385ba1167f9a3e241f4c95a19370 /mcp
parent33d945e3045f68ea7cbd2f1b8d01618cb3fed23c (diff)
parentc7bcc344aebbf308ccaac11d26b876393bbbbf20 (diff)
Merge "AArch64: s/ocata/pike/g in scenario defaults"
Diffstat (limited to 'mcp')
-rw-r--r--mcp/config/scenario/defaults-aarch64.yaml6
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml4
2 files changed, 5 insertions, 5 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/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 164d90c42..bf88816c4 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