aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-06 15:45:45 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-02-06 15:45:45 +0000
commit6357d861c2f7c69c1486a40a81d24d7dda66eba8 (patch)
tree76291660b48613468d8e0cbf6c3ef6ed0d5cf961
parent4658acf952c263b2c402c43ac7cd90a41d4272fa (diff)
parent7fc0bbb4d953be9d24e8b8f29c7c6d30444c1a8f (diff)
Merge "[apt-mk] Switch back to nightly"
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml2
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml2
-rwxr-xr-xmcp/scripts/salt.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml
index 6f09a1adc..78c5c3e9a 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml
@@ -13,7 +13,7 @@ classes:
# - cluster.mcp-pike-common-ha.stacklight.client
parameters:
_param:
- apt_mk_version: stable
+ apt_mk_version: nightly
mcp_repo_version: 1.1
salt_version: 2016.11
cluster_domain: ${_param:cluster_name}.local
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
index f62e20448..d6ec205b3 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
@@ -9,7 +9,7 @@
parameters:
_param:
openstack_version: pike
- apt_mk_version: stable
+ apt_mk_version: nightly
mcp_repo_version: 1.1
openstack_region: RegionOne
admin_email: root@localhost
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index 87f7a164e..310b78a7a 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -73,7 +73,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
echo 'Dpkg::Use-Pty "0";' > /etc/apt/apt.conf.d/90silence-dpkg
OLD_DOMAIN=\$(grep -sPzo "id: cfg01\.\K(\S*)" /etc/salt/minion.d/minion.conf) || true
BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2016.11 " \
- MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=stable \
+ MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly \
EXTRA_FORMULAS="nfs" \
./salt-master-init.sh
salt-key -Ay