summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/all-mcp-ocata-common
diff options
context:
space:
mode:
authorGuillermo Herrero <guillermo.herrero@enea.com>2017-11-16 14:05:42 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-21 15:46:29 +0000
commit33e1d84ffb71e283acc0b3f834066a0bc5837780 (patch)
treee733f7f52799204c6db841bba010cf8e245c042b /mcp/reclass/classes/cluster/all-mcp-ocata-common
parentee21bd791dd74558254f2b4aaef15504c9d395ea (diff)
[baremetal] public gateway setup on prx nodes
- prx: add route for public traffic to public interface - prx: add route towards salt master through maas - remove dashboard class from proxy node (already implements horizon) - remove dashboard (and benchmark) class definitions (no longer used) - (temporary) backport Pharos change for adapter template JIRA: FUEL-305 Change-Id: Ia14a18ac0123c1134d8d99dc43da9a1f770001d0 Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com> (cherry picked from commit 07f4e0238646fcb77072769feb8a0b68df52caca)
Diffstat (limited to 'mcp/reclass/classes/cluster/all-mcp-ocata-common')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example1
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml2
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template2
3 files changed, 5 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example
index d7876282a..e5b852f32 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example
@@ -61,6 +61,7 @@ parameters:
opnfv_opendaylight_server_node01_single_address: 10.167.4.111
+ opnfv_net_public_gw: 172.30.10.1
opnfv_name_servers: ['8.8.8.8', '8.8.4.4']
opnfv_dns_server01: '8.8.8.8'
opnfv_net_mgmt_vlan: 300
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml
index 9dbc030e3..4fd9e0368 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml
@@ -10,6 +10,8 @@ parameters:
_param:
reclass_config_master: 10.20.0.2
opnfv_maas_mcp_address: 10.20.0.3
+ opnfv_net_mcpcontrol: 10.20.0.0
+ opnfv_net_mcpcontrol_mask: 255.255.255.0
# These should be moved to pod_config.yml and read based on PDF admin net
opnfv_maas_pxe_network_address: 192.168.11.0
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
index cbd47ef80..1445917e6 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
@@ -10,6 +10,8 @@ parameters:
_param:
reclass_config_master: ${SALT_MASTER}
opnfv_maas_mcp_address: ${MAAS_IP}
+ opnfv_net_mcpcontrol: ${SALT_MASTER%.*}.0
+ opnfv_net_mcpcontrol_mask: 255.255.255.0
# These should be moved to pod_config.yml and read based on PDF admin net
opnfv_maas_pxe_network_address: ${MAAS_PXE_NETWORK}