aboutsummaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-01-22 09:22:02 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-01-22 09:22:02 +0000
commit02345dc455b538960ef9a2cee9acbc8e4ec60fb1 (patch)
tree00fbf993b591a2cb6dfcacbba05e5d7a8a4780d1 /mcp
parent924f8cff8c974547db29f16e150f2041af5de9e8 (diff)
parent4563ea7d62238e8273d840a8d9c6c1e179ca584e (diff)
Merge "reclass: apt_mk_version: stable"
Diffstat (limited to 'mcp')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-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/baremetal-mcp-pike-common-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml
index f2a6b4e68..7d513e9bf 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml
@@ -13,7 +13,7 @@ classes:
# - cluster.baremetal-mcp-pike-common-ha.stacklight.client
parameters:
_param:
- apt_mk_version: nightly
+ apt_mk_version: stable
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 89b06fb7e..d5606b594 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: nightly
+ apt_mk_version: stable
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 a13194363..1975f9e54 100755
--- 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