diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-22 14:57:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-22 14:57:52 +0000 |
| commit | 9b5bffe65199af34cb089c7a782e5e4234610768 (patch) | |
| tree | b148ae9f64d5ade64d7d33e7575a34f9345f1ac6 /mcp/reclass/classes/cluster/baremetal-mcp-ocata-common | |
| parent | 322884cd6007db93ef69ac0faeaefec9f32c010c (diff) | |
| parent | 33e1d84ffb71e283acc0b3f834066a0bc5837780 (diff) | |
Merge "[baremetal] public gateway setup on prx nodes" into stable/euphrates
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-common')
3 files changed, 22 insertions, 39 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_benchmark.yml deleted file mode 100644 index b9c3e168a..000000000 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_benchmark.yml +++ /dev/null @@ -1,17 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -parameters: - _param: - dhcp_nic: eth0 - single_nic: eth1 - linux: - network: - interface: - dhcp: ${_param:linux_dhcp_interface} - single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_dashboard.yml deleted file mode 100644 index e082d2681..000000000 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_dashboard.yml +++ /dev/null @@ -1,20 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - system.horizon.server.single -parameters: - _param: - horizon_site_branding: OpenStack Dashboard - dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} - single_nic: ${_param:opnfv_vcp_vm_secondary_interface} - linux: - network: - interface: - dhcp: ${_param:linux_dhcp_interface} - single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml index 1d0e8d1c5..6239df2ef 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml @@ -37,8 +37,28 @@ parameters: linux: network: interface: - dhcp: ${_param:linux_dhcp_interface} - single: ${_param:linux_single_interface} + dhcp: + enabled: true + type: eth + proto: dhcp + name: ${_param:dhcp_nic} + route: + mcpcontol: + address: ${_param:opnfv_net_mcpcontrol} + netmask: ${_param:opnfv_net_mcpcontrol_mask} + gateway: ${_param:opnfv_infra_maas_node01_deploy_address} + single: + enabled: true + type: eth + proto: static + name: ${_param:single_nic} + address: ${_param:single_address} + netmask: 255.255.255.0 + route: + public: + address: 0.0.0.0 + netmask: 0.0.0.0 + gateway: ${_param:opnfv_net_public_gw} control: enabled: true type: eth |