From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Fri, 29 Jun 2018 16:20:37 +0000 (+0200)
Subject: Revert "[salt-formulas] Switch to 'testing' dist"
X-Git-Tag: opnfv-7.0.0~148
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F61%2F59361%2F1;p=fuel.git

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>
---

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