reclass: apt_mk_version: 2017.12

Although previous commit e3bc5ad changed the first reference of
apt-mk repos to '2017.12' from 'nightly', it missed the cluster model.

This fixes redeploys with `-f`, which fail due to conflicts between
already installed '2017.12' packages and 'nightly' ones.

Fixes: e3bc5ad

Change-Id: I854bac86feaaa61da0b68d158e270eec1ee0ccb7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml
index a4f77a7..875296b 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml
@@ -13,7 +13,7 @@ classes:
   # - cluster.baremetal-mcp-ocata-common-ha.stacklight.client
 parameters:
   _param:
-    apt_mk_version: nightly
+    apt_mk_version: 2017.12
     mcp_repo_version: 1.1
     salt_version: 2016.11
     cluster_domain: ${_param:cluster_name}.local

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/openstack_init.yml
index 81f050f..7037d64 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/openstack_init.yml
@@ -9,7 +9,7 @@
 parameters:
   _param:
     openstack_version: ocata
-    apt_mk_version: nightly
+    apt_mk_version: 2017.12
     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 ac9d74f..72c0502 100755 (executable)
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -54,7 +54,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
   echo ' done'
 
   mkdir -p /srv/salt /usr/share/salt-formulas/reclass
-  rm -rf ${OPNFV_GIT_DIR}
+  rm -rf ${OPNFV_GIT_DIR} ${OPNFV_FUEL_DIR}
   mv ${OPNFV_TMP_DIR} ${OPNFV_GIT_DIR} && chown -R root.root ${OPNFV_GIT_DIR}
   find ${OPNFV_GIT_DIR} -name '.git' -type f | while read f_git; do
     sed -i 's@${LOCAL_GIT_DIR}@${OPNFV_GIT_DIR}@g' \$f_git