[salt-formulas] Also switch reclass to 'testing'

Previous commit only changed the dist during Salt master bootstrap,
but failed to update the DEB repo configration in reclass.

Fixes: a8f43411

Change-Id: Ie011719cdc1c75cba363f53e51f22ce7cf138a5e
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 c01042f..0edc6bd 100644 (file)
--- 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: nightly
+    apt_mk_version: testing
     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 8721565..6c89610 100644 (file)
--- 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: nightly
+    apt_mk_version: testing
     mcp_repo_version: 1.1
     openstack_region: RegionOne
     admin_email: root@localhost