diff options
Diffstat (limited to 'mcp/reclass/classes')
7 files changed, 50 insertions, 57 deletions
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml new file mode 100644 index 000000000..53e312787 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml @@ -0,0 +1,18 @@ +parameters: + _param: + # infra service addresses + infra_config_address: 172.16.10.100 + # openstack service addresses + openstack_control_address: 172.16.10.101 + openstack_control_node01_address: 172.16.10.101 + openstack_control_node02_address: 172.16.10.102 + openstack_control_node03_address: 172.16.10.103 + openstack_database_address: ${_param:openstack_control_address} + openstack_message_queue_address: ${_param:openstack_control_address} + openstack_message_queue_node01_address: ${_param:openstack_control_node01_address} + openstack_message_queue_node02_address: ${_param:openstack_control_node02_address} + openstack_message_queue_node03_address: ${_param:openstack_control_node03_address} + openstack_gateway_address: 172.16.10.110 + control_address: ${_param:openstack_control_address} + ntp_strata_host1: 1.se.pool.ntp.org + ntp_strata_host2: 0.se.pool.ntp.org diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml index 0698c644b..954a7a189 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml @@ -1,5 +1,6 @@ classes: - system.linux.system.single +- cluster.virtual-mcp-ocata-common.init_options - cluster.virtual-mcp-ocata-odl-router.infra - cluster.virtual-mcp-ocata-odl-router.openstack @@ -7,18 +8,4 @@ parameters: _param: cluster_domain: virtual-mcp-ocata-odl-router.local cluster_name: virtual-mcp-ocata-odl-router - # infra service addresses - infra_config_address: 172.16.10.100 - # openstack service addresses - openstack_control_address: 172.16.10.101 - openstack_control_node01_address: 172.16.10.101 - openstack_control_node02_address: 172.16.10.102 - openstack_control_node03_address: 172.16.10.103 - openstack_database_address: ${_param:openstack_control_address} - openstack_message_queue_address: ${_param:openstack_control_address} - openstack_message_queue_node01_address: ${_param:openstack_control_node01_address} - openstack_message_queue_node02_address: ${_param:openstack_control_node02_address} - openstack_message_queue_node03_address: ${_param:openstack_control_node03_address} - openstack_gateway_address: 172.16.10.110 opendaylight_service_host: 172.16.10.111 - control_address: ${_param:openstack_control_address} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml index e25f41742..ba710a36e 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml @@ -46,9 +46,11 @@ parameters: ovsdb_server_iface: ptcp:6639:127.0.0.1 ovsdb_odl_iface: tcp:${_param:opendaylight_service_host}:6640 tunnel_ip: ${_param:tenant_address} + provider_mappings: physnet1:br-floating linux: network: bridge: openvswitch + gateway: ${_param:openstack_gateway_address} interface: dhcp_int: enabled: true @@ -68,6 +70,12 @@ parameters: mtu: ${_param:interface_mtu} proto: manual type: eth + external_interface: + enabled: true + name: ${_param:external_interface} + mtu: ${_param:interface_mtu} + proto: manual + type: eth br-mgmt: enabled: true type: bridge @@ -82,5 +90,25 @@ parameters: proto: static address: ${_param:tenant_address} netmask: 255.255.255.0 + gateway: 10.1.0.110 use_interfaces: - ${_param:tenant_interface} + br-floating: + enabled: true + type: ovs_bridge + mtu: ${_param:interface_mtu} + float-to-ex: + enabled: true + type: ovs_port + mtu: ${_param:interface_mtu} + bridge: br-floating + br-ex: + enabled: true + type: bridge + mtu: ${_param:interface_mtu} + address: ${_param:external_address} + netmask: 255.255.255.0 + use_interfaces: + - ${_param:external_interface} + use_ovs_ports: + - float-to-ex diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/init.yml index 868661363..dad16d69a 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/init.yml @@ -1,5 +1,6 @@ classes: - system.linux.system.single +- cluster.virtual-mcp-ocata-common.init_options - cluster.virtual-mcp-ocata-odl.infra - cluster.virtual-mcp-ocata-odl.openstack @@ -7,18 +8,4 @@ parameters: _param: cluster_domain: virtual-mcp-ocata-odl.local cluster_name: virtual-mcp-ocata-odl - # infra service addresses - infra_config_address: 172.16.10.100 - # openstack service addresses - openstack_control_address: 172.16.10.101 - openstack_control_node01_address: 172.16.10.101 - openstack_control_node02_address: 172.16.10.102 - openstack_control_node03_address: 172.16.10.103 - openstack_database_address: ${_param:openstack_control_address} - openstack_message_queue_address: ${_param:openstack_control_address} - openstack_message_queue_node01_address: ${_param:openstack_control_node01_address} - openstack_message_queue_node02_address: ${_param:openstack_control_node02_address} - openstack_message_queue_node03_address: ${_param:openstack_control_node03_address} - openstack_gateway_address: 172.16.10.110 opendaylight_service_host: 172.16.10.111 - control_address: ${_param:openstack_control_address} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml index 6c6640a4f..38431a58c 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml @@ -1,5 +1,4 @@ classes: -- system.linux.system.repo.ubuntu - system.linux.system.repo.mcp.openstack - system.linux.system.repo.mcp.extra - system.linux.system.repo.saltstack.xenial diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml index 0b6cce7c6..4626fd6c3 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml @@ -1,5 +1,6 @@ classes: - system.linux.system.single +- cluster.virtual-mcp-ocata-common.init_options - cluster.virtual-mcp-ocata-ovs-dpdk.infra - cluster.virtual-mcp-ocata-ovs-dpdk.openstack @@ -7,17 +8,3 @@ parameters: _param: cluster_domain: virtual-mcp-ocata-ovs-dpdk.local cluster_name: virtual-mcp-ocata-ovs-dpdk - # infra service addresses - infra_config_address: 172.16.10.100 - # openstack service addresses - openstack_control_address: 172.16.10.101 - openstack_control_node01_address: 172.16.10.101 - openstack_control_node02_address: 172.16.10.102 - openstack_control_node03_address: 172.16.10.103 - openstack_database_address: ${_param:openstack_control_address} - openstack_message_queue_address: ${_param:openstack_control_address} - openstack_message_queue_node01_address: ${_param:openstack_control_node01_address} - openstack_message_queue_node02_address: ${_param:openstack_control_node02_address} - openstack_message_queue_node03_address: ${_param:openstack_control_node03_address} - openstack_gateway_address: 172.16.10.110 - control_address: ${_param:openstack_control_address} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml index 41dfda04a..86c0cf50d 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml @@ -1,5 +1,6 @@ classes: - system.linux.system.single +- cluster.virtual-mcp-ocata-common.init_options - cluster.virtual-mcp-ocata-ovs.infra - cluster.virtual-mcp-ocata-ovs.openstack @@ -7,17 +8,3 @@ parameters: _param: cluster_domain: virtual-mcp-ocata-ovs.local cluster_name: virtual-mcp-ocata-ovs - # infra service addresses - infra_config_address: 172.16.10.100 - # openstack service addresses - openstack_control_address: 172.16.10.101 - openstack_control_node01_address: 172.16.10.101 - openstack_control_node02_address: 172.16.10.102 - openstack_control_node03_address: 172.16.10.103 - openstack_database_address: ${_param:openstack_control_address} - openstack_message_queue_address: ${_param:openstack_control_address} - openstack_message_queue_node01_address: ${_param:openstack_control_node01_address} - openstack_message_queue_node02_address: ${_param:openstack_control_node02_address} - openstack_message_queue_node03_address: ${_param:openstack_control_node03_address} - openstack_gateway_address: 172.16.10.110 - control_address: ${_param:openstack_control_address} |