diff options
Diffstat (limited to 'mcp/reclass/classes/cluster')
6 files changed, 7 insertions, 5 deletions
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 2434a9117..0e753cd2f 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,7 @@ parameters: neutron_compute_agent_mode: legacy neutron_compute_external_access: 'True' galera_server_cluster_name: openstack_cluster - armband_repo_version: 'queens' # ${_param:openstack_version} + 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 8147b8c47..bc0a37678 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,7 @@ 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: 'queens' # ${_param:openstack_version} + armband_repo_version: ${_param:openstack_version} glance_version: ${_param:openstack_version} glance_service_host: ${_param:cluster_local_address} keystone_version: ${_param:openstack_version} diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 index 107965e99..3c8a35e06 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 @@ -22,6 +22,7 @@ parameters: java_min_mem: 6g java_max_mem: 6g router_enabled: true + netvirt_nat_mode: conntrack karaf_features: odl_default: - odl-restconf-all diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 index aba648c67..78263489c 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 @@ -22,6 +22,7 @@ parameters: java_min_mem: 3g java_max_mem: 3g router_enabled: true + netvirt_nat_mode: conntrack karaf_features: odl_default: - odl-restconf-all diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 index bbd70caa5..58ba34f56 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 @@ -18,7 +18,7 @@ parameters: network: interface: {%- if '-ovs-' in conf.MCP_DEPLOY_SCENARIO %} - {{ nm.cmp001.nic_private }}: + {{ nm.ctl01.nic_private }}: ovs_bridge: br-prv br-prv: enabled: true @@ -36,5 +36,5 @@ parameters: address: ${_param:tenant_address} netmask: ${_param:opnfv_net_private_mask} use_interfaces: - - {{ ma.interface_str(nm.cmp001.nic_private, vlan_private_start) }} + - {{ ma.interface_str(nm.ctl01.nic_private, vlan_private_start) }} {%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml.j2 index 2f89ac3f8..8d11eedcd 100644 --- a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml.j2 @@ -19,7 +19,7 @@ parameters: linux: network: interface: - {{ nm.cmp001.nic_private }}: + {{ nm.ctl01.nic_private }}: ovs_bridge: br-prv br-prv: enabled: true |