diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-22 15:25:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-22 15:25:02 +0000 |
| commit | c24aa2e8919bc13f14236677503983075e35f562 (patch) | |
| tree | a895f52d8770812dce634c5bf78c812447525d02 /mcp/reclass/classes/cluster | |
| parent | 0c7d890cdb20fdcf2a5e0e0a629088ee045cf4af (diff) | |
| parent | 2b7d2584b3749dab03e1f6a099d3b26b43326cc4 (diff) | |
Merge "reclass: apt_mk_version: 2017.12" into stable/euphrates
Diffstat (limited to 'mcp/reclass/classes/cluster')
| -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 |