diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-21 03:35:46 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-21 05:49:40 +0100 |
| commit | 2b7d2584b3749dab03e1f6a099d3b26b43326cc4 (patch) | |
| tree | 7c91457d59599bfee0bfcee164e7c342c6dd855c /mcp/reclass | |
| parent | 2d347e8fd382bbb99c9747328e41734b331f745c (diff) | |
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>
Diffstat (limited to 'mcp/reclass')
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml | 2 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/openstack_init.yml | 2 |
2 files changed, 2 insertions, 2 deletions
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 a4f77a72e..875296b5f 100644 --- 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 81f050f89..7037d64df 100644 --- 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 |