summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-01-21 10:03:09 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-01-21 10:03:09 +0000
commitd239cdfa3dbcc6ceec8df947bcd6234e861baba9 (patch)
treeac2e0462136fb5634c7d24b24468159f00b57455 /mcp/reclass/classes
parent6f51790b669b6d8094ac24055ef0e690913d62aa (diff)
parent608cea374a0c37826e6fe9bc544a6c540439d676 (diff)
Merge "[noha] baremetal: Fix undef armband_repo_version"
Diffstat (limited to 'mcp/reclass/classes')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j21
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j21
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j21
3 files changed, 1 insertions, 2 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 b0ca10205..0f3cab91b 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
@@ -13,6 +13,7 @@ classes:
parameters:
_param:
openstack_version: rocky
+ armband_repo_version: ${_param:openstack_version}
apt_mk_version: nightly
mcp_repo_version: 1.1
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
index 0e753cd2f..3b4492d38 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
@@ -121,7 +121,6 @@ parameters:
neutron_compute_agent_mode: legacy
neutron_compute_external_access: 'True'
galera_server_cluster_name: openstack_cluster
- armband_repo_version: ${_param:openstack_version}
glance_version: ${_param:openstack_version}
glance_service_host: ${_param:openstack_control_address}
keystone_version: ${_param:openstack_version}
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 bc0a37678..dbddd647b 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
@@ -32,7 +32,6 @@ parameters:
cluster_node02_address: ${_param:opnfv_openstack_control_node02_address}
cluster_node03_hostname: ctl03
cluster_node03_address: ${_param:opnfv_openstack_control_node03_address}
- armband_repo_version: ${_param:openstack_version}
glance_version: ${_param:openstack_version}
glance_service_host: ${_param:cluster_local_address}
keystone_version: ${_param:openstack_version}