Code Review
/
fuel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
(from parent 1:
924f8cf
)
Merge "reclass: apt_mk_version: stable"
author
Michael Polenchuk
<mpolenchuk@mirantis.com>
Mon, 22 Jan 2018 09:22:02 +0000
(09:22 +0000)
committer
Gerrit Code Review
<gerrit@opnfv.org>
Mon, 22 Jan 2018 09:22:02 +0000
(09:22 +0000)
mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
patch
|
blob
|
history
mcp/scripts/salt.sh
patch
|
blob
|
history
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
f2a6b4e
..
7d513e9
100644
(file)
--- 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
89b06fb
..
d5606b5
100644
(file)
--- 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
a131943
..
1975f9e
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