aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-21 03:35:46 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-21 05:48:40 +0100
commit4563ea7d62238e8273d840a8d9c6c1e179ca584e (patch)
treeb202b22e0f71f2139815caa6adb1ce35684074e6 /mcp/reclass/classes
parentd06bcfb72c44b507c3efee4de00f415869f48450 (diff)
reclass: apt_mk_version: stable
Although previous commit d1b6119 changed the first reference of apt-mk repos to 'stable' from 'nightly', it missed the cluster model. This fixes redeploys with `-f`, which fail due to conflicts between already installed 'stable' packages and 'nightly' ones. Fixes: d1b6119 Change-Id: I854bac86feaaa61da0b68d158e270eec1ee0ccb7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes')
-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
2 files changed, 2 insertions, 2 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