summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-21 14:00:28 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-09-21 14:00:28 +0000
commitf172f8e3dc92710f79a33ad38aa3da6313da879c (patch)
tree610357bbcea7a37a1cb9a5d16c8502cb1eb74296 /mcp/reclass/classes/cluster
parent7099ffcba4c7a84dfd2ac53fd59149948665f884 (diff)
parent3ee785abc3b36e10a5c89e879168725a135b731b (diff)
Merge "[state] virtual_init: Limit to mas01 on baremetal"
Diffstat (limited to 'mcp/reclass/classes/cluster')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j22
3 files changed, 2 insertions, 4 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
index 15fbf2853..eb0a538f6 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
@@ -12,6 +12,8 @@ classes:
parameters:
_param:
openstack_version: queens
+ apt_mk_version: nightly
+ mcp_repo_version: 1.1
banner_company_name: OPNFV
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2
index 59d75d478..05b96e40b 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2
@@ -12,8 +12,6 @@ classes:
# - cluster.mcp-common-ha.stacklight.client
parameters:
_param:
- apt_mk_version: nightly
- mcp_repo_version: 1.1
salt_version: 2017.7
cluster_domain: ${_param:cluster_name}.local
# stacklight_environment: ${_param:cluster_domain}
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
index 875c7603b..5aae27c41 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
@@ -9,8 +9,6 @@
---
parameters:
_param:
- apt_mk_version: nightly
- mcp_repo_version: 1.1
openstack_region: RegionOne
admin_email: root@localhost
cluster_public_protocol: http