summaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-29 18:20:37 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-29 18:21:11 +0200
commit5d54a99cb71172e5ccb1bff94bdd98c3212bd769 (patch)
tree4ac21d256ae4c059ed9e7e3311ba2be9564ca85f /mcp
parent1e76bad68ffc8f4235d11599fdf074b38ac76c7b (diff)
Revert "[salt-formulas] Switch to 'testing' dist"
This reverts commit a8f434118013a69295bdc0f9fc8294c539742c01. This reverts commit b52ef6ea62f43de4b91e2becd92a3282e569925c. Change-Id: I604df3f50febb049f1545a8141c5abb013cf6c69 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp')
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j22
-rwxr-xr-xmcp/scripts/salt.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2
index 0edc6bd34..c01042f54 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2
@@ -13,7 +13,7 @@ classes:
# - cluster.mcp-common-ha.stacklight.client
parameters:
_param:
- apt_mk_version: testing
+ 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/mcp-common-noha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
index 6c89610b5..872156574 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
@@ -10,7 +10,7 @@
parameters:
_param:
openstack_version: queens
- apt_mk_version: testing
+ 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 9288f97d2..4a20bc413 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -80,7 +80,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=testing \
+ MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly \
EXTRA_FORMULAS="nfs panko gnocchi oslo-templates" \
./salt-master-init.sh
salt-key -Ay