summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack
diff options
context:
space:
mode:
authorGuillermo Herrero <guillermo.herrero@enea.com>2017-09-25 12:48:26 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-26 16:01:09 +0000
commit48f978f10c6f31ea1b9e0d5aabfe8a83c96081fd (patch)
tree241aad141fd67378af584c517725ac9d93585c1c /mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack
parent533b81df35acd7c2f16cd347cf3167583e870d38 (diff)
Extended PDF support to all baremetal scenarios
JIRA: FUEL-275 Change-Id: I67e8d7ab95e35c78a4f960a12733124fe7bffaec Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com> (cherry picked from commit 809ea60a05f55d98814f8794a46540edcd2b0298)
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml12
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml76
2 files changed, 44 insertions, 44 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
index 82b1a6eff..ba0f385e7 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
@@ -91,19 +91,19 @@ parameters:
netmask: 255.255.255.0
mtu: 1500
use_interfaces:
- - ${_param:tenant_nic}.302
- vlan300:
+ - ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan}
+ mgmt-vlan:
enabled: true
proto: manual
type: vlan
- name: ${_param:mgmt_nic}.300
+ name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
use_interfaces:
- ${_param:mgmt_nic}
- vlan302:
+ tenant-vlan:
enabled: true
proto: manual
type: vlan
- name: ${_param:tenant_nic}.302
+ name: ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan}
use_interfaces:
- ${_param:tenant_nic}
br-ctl:
@@ -113,7 +113,7 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
use_interfaces:
- - ${_param:mgmt_nic}.300
+ - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
br-floating:
enabled: true
type: ovs_bridge
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
index 16bdc0671..c7df472d3 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
@@ -1,35 +1,36 @@
---
+# yamllint disable rule:line-length
parameters:
_param:
openstack_version: ocata
- openstack_gateway_node01_address: 10.167.4.124
- openstack_gateway_node02_address: 10.167.4.125
- openstack_gateway_node03_address: 10.167.4.126
- openstack_gateway_node01_tenant_address: 10.1.0.6
- openstack_gateway_node02_tenant_address: 10.1.0.7
- openstack_gateway_node03_tenant_address: 10.1.0.9
+ openstack_gateway_node01_address: ${_param:opnfv_openstack_gateway_node01_address}
+ openstack_gateway_node02_address: ${_param:opnfv_openstack_gateway_node02_address}
+ openstack_gateway_node03_address: ${_param:opnfv_openstack_gateway_node03_address}
+ openstack_gateway_node01_tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address}
+ openstack_gateway_node02_tenant_address: ${_param:opnfv_openstack_gateway_node02_tenant_address}
+ openstack_gateway_node03_tenant_address: ${_param:opnfv_openstack_gateway_node03_tenant_address}
openstack_gateway_node01_hostname: gtw01
openstack_gateway_node02_hostname: gtw02
openstack_gateway_node03_hostname: gtw03
# openstack service addresses
- openstack_proxy_address: 10.167.4.80
- openstack_proxy_node01_address: 10.167.4.81
- openstack_proxy_node02_address: 10.167.4.82
- openstack_control_address: 10.167.4.10
- openstack_control_node01_address: 10.167.4.11
- openstack_control_node02_address: 10.167.4.12
- openstack_control_node03_address: 10.167.4.13
- openstack_database_address: 10.167.4.50
- openstack_database_node01_address: 10.167.4.51
- openstack_database_node02_address: 10.167.4.52
- openstack_database_node03_address: 10.167.4.53
- openstack_message_queue_address: 10.167.4.40
- openstack_message_queue_node01_address: 10.167.4.41
- openstack_message_queue_node02_address: 10.167.4.42
- openstack_message_queue_node03_address: 10.167.4.43
+ openstack_proxy_address: ${_param:opnfv_openstack_proxy_address}
+ openstack_proxy_node01_address: ${_param:opnfv_openstack_proxy_node01_address}
+ openstack_proxy_node02_address: ${_param:opnfv_openstack_proxy_node02_address}
+ openstack_control_address: ${_param:opnfv_openstack_control_address}
+ openstack_control_node01_address: ${_param:opnfv_openstack_control_node01_address}
+ openstack_control_node02_address: ${_param:opnfv_openstack_control_node02_address}
+ openstack_control_node03_address: ${_param:opnfv_openstack_control_node03_address}
+ openstack_database_address: ${_param:opnfv_openstack_database_address}
+ openstack_database_node01_address: ${_param:opnfv_openstack_database_node01_address}
+ openstack_database_node02_address: ${_param:opnfv_openstack_database_node02_address}
+ openstack_database_node03_address: ${_param:opnfv_openstack_database_node03_address}
+ openstack_message_queue_address: ${_param:opnfv_openstack_message_queue_address}
+ openstack_message_queue_node01_address: ${_param:opnfv_openstack_message_queue_node01_address}
+ openstack_message_queue_node02_address: ${_param:opnfv_openstack_message_queue_node02_address}
+ openstack_message_queue_node03_address: ${_param:opnfv_openstack_message_queue_node03_address}
openstack_telemetry_hostname: mdb
@@ -37,27 +38,26 @@ parameters:
openstack_telemetry_node02_hostname: mdb02
openstack_telemetry_node03_hostname: mdb03
- openstack_telemetry_address: 10.167.4.75
- openstack_telemetry_node01_address: 10.167.4.76
- openstack_telemetry_node02_address: 10.167.4.77
- openstack_telemetry_node03_address: 10.167.4.78
+ openstack_telemetry_address: ${_param:opnfv_openstack_telemetry_address}
+ openstack_telemetry_node01_address: ${_param:opnfv_openstack_telemetry_node01_address}
+ openstack_telemetry_node02_address: ${_param:opnfv_openstack_telemetry_node02_address}
+ openstack_telemetry_node03_address: ${_param:opnfv_openstack_telemetry_node03_address}
# OpenStack Compute
- openstack_compute_node01_single_address: 10.167.4.101
- openstack_compute_node02_single_address: 10.167.4.102
- openstack_compute_node03_single_address: 10.167.4.103
- openstack_compute_node01_control_address: 10.167.4.101
- openstack_compute_node02_control_address: 10.167.4.102
- openstack_compute_node03_control_address: 10.167.4.103
- openstack_compute_node01_tenant_address: 10.1.0.101
- openstack_compute_node02_tenant_address: 10.1.0.102
- openstack_compute_node03_tenant_address: 10.1.0.103
- openstack_compute_node01_external_address: 172.30.10.2
- openstack_compute_node02_external_address: 172.30.10.3
+ openstack_compute_node01_single_address: ${_param:opnfv_openstack_compute_node01_single_address}
+ openstack_compute_node02_single_address: ${_param:opnfv_openstack_compute_node02_single_address}
+ openstack_compute_node03_single_address: ${_param:opnfv_openstack_compute_node03_single_address}
+ openstack_compute_node01_control_address: ${_param:opnfv_openstack_compute_node01_control_address}
+ openstack_compute_node02_control_address: ${_param:opnfv_openstack_compute_node02_control_address}
+ openstack_compute_node03_control_address: ${_param:opnfv_openstack_compute_node03_control_address}
+ openstack_compute_node01_tenant_address: ${_param:opnfv_openstack_compute_node01_tenant_address}
+ openstack_compute_node02_tenant_address: ${_param:opnfv_openstack_compute_node02_tenant_address}
+ openstack_compute_node03_tenant_address: ${_param:opnfv_openstack_compute_node03_tenant_address}
+ openstack_compute_node01_external_address: ${_param:opnfv_openstack_compute_node01_external_address}
+ openstack_compute_node02_external_address: ${_param:opnfv_openstack_compute_node02_external_address}
# opendaylight options
- opendaylight_server_node01_single_address: 10.167.4.111
- # yamllint disable rule:line-length
+ opendaylight_server_node01_single_address: ${_param:opnfv_opendaylight_server_node01_single_address}
opendaylight_service_host: ${_param:opendaylight_server_node01_single_address}
opendaylight_server_node01_hostname: odl01
opendaylight_router: odl-router_v2