Merge "[baremetal] public gateway setup on prx nodes"

2 files changed, 79 insertions, 5 deletions

diff --git a/mcp/patches/pharos/0006-extend-public-gateway-support.patch b/mcp/patches/pharos/0006-extend-public-gateway-support.patch
new file mode 100644
index 000000000..d7b6ae77e
--- /dev/null
+++ b/mcp/patches/pharos/0006-extend-public-gateway-support.patch
@@ -0,0 +1,62 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: 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
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+From: Guillermo Herrero <guillermo.herrero@enea.com>
+Date: Mon, 20 Nov 2017 11:33:29 +0100
+Subject: [PATCH] extend public gateway support
+
+JIRA: FUEL-305
+
+Change-Id: Ic5a2d499925aeec5b597394a059640ddae83fb2d
+Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
+---
+ config/installers/fuel/pod_config.yml.j2 | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
+index bd815d5..e42e3d5 100644
+--- a/config/installers/fuel/pod_config.yml.j2
++++ b/config/installers/fuel/pod_config.yml.j2
+@@ -8,6 +8,9 @@
+     {%- if conf.net_config.public.dns is defined -%}
+         {%- set dns_public = conf['net_config']['public']['dns'] -%}
+     {%- endif -%}
++    {%- if conf.net_config.public.gateway is defined -%}
++        {%- set net_public_gw = conf['net_config']['public']['gateway'] -%}
++    {%- endif -%}
+     {%- set pxe_interface = conf['net_config']['admin']['interface'] -%}
+ {%- else -%}
+     {%- set net_admin = '192.168.11.0' -%}
+@@ -22,6 +25,10 @@
+ {%- if dns_public is not defined -%}
+     {%- set dns_public = [ '8.8.8.8', '8.8.4.4' ] -%}
+ {%- endif -%}
++{%- if net_public_gw is not defined -%}
++    {%- set net_public_gw =  net_public | ipaddr_index('1')  -%}
++{%- endif -%}
++
+ ---
+ parameters:
+   _param:
+@@ -55,6 +62,8 @@ parameters:
+     opnfv_openstack_proxy_address: {{ net_public | ipaddr_index('103') }}
+     opnfv_openstack_proxy_node01_address: {{ net_public | ipaddr_index('104') }}
+     opnfv_openstack_proxy_node02_address: {{ net_public | ipaddr_index('105') }}
++    opnfv_openstack_proxy_node01_control_address: {{ net_mgmt | ipaddr_index('104') }}
++    opnfv_openstack_proxy_node02_control_address: {{ net_mgmt | ipaddr_index('105') }}
+     opnfv_openstack_control_address: {{ net_mgmt | ipaddr_index('10') }}
+     opnfv_openstack_control_node01_address: {{ net_mgmt | ipaddr_index('11') }}
+     opnfv_openstack_control_node02_address: {{ net_mgmt | ipaddr_index('12') }}
+@@ -85,6 +94,7 @@ parameters:
+
+     opnfv_opendaylight_server_node01_single_address: {{ net_mgmt | ipaddr_index('111') }}
+
++    opnfv_net_public_gw: {{ net_public_gw }}
+     opnfv_name_servers: {{ dns_public }}
+     opnfv_dns_server01: '{{ dns_public[0] }}'
+
diff --git a/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch b/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch
index cc2200679..c7ba5a740 100644
--- a/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch
+++ b/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch
@@ -11,10 +11,22 @@ Date: Thu, 29 Jun 2017 12:22:42 +0400
 Subject: [PATCH] Bring in opendaylight support
 
 Change-Id: I3efec9a8b586a6c75b1c1635ad2a7024d73d9ad2
+---
+ neutron/control/opendaylight/cluster.yml               | 17 +++++++++++++++++
+ neutron/control/opendaylight/single.yml                | 15 +++++++++++++++
+ neutron/gateway/opendaylight/single.yml                |  7 +++++++
+ opendaylight/server/single.yml                         |  2 ++
+ reclass/storage/system/opendaylight_control_single.yml | 13 +++++++++++++
+ 5 files changed, 54 insertions(+)
+ create mode 100644 neutron/control/opendaylight/cluster.yml
+ create mode 100644 neutron/control/opendaylight/single.yml
+ create mode 100644 neutron/gateway/opendaylight/single.yml
+ create mode 100644 opendaylight/server/single.yml
+ create mode 100644 reclass/storage/system/opendaylight_control_single.yml
 
 diff --git a/neutron/control/opendaylight/cluster.yml b/neutron/control/opendaylight/cluster.yml
 new file mode 100644
-index 00000000..a32e7abb
+index 0000000..a32e7ab
 --- /dev/null
 +++ b/neutron/control/opendaylight/cluster.yml
 @@ -0,0 +1,17 @@
@@ -37,7 +49,7 @@ index 00000000..a32e7abb
 +            driver: opendaylight_v2
 diff --git a/neutron/control/opendaylight/single.yml b/neutron/control/opendaylight/single.yml
 new file mode 100644
-index 00000000..053f14df
+index 0000000..053f14d
 --- /dev/null
 +++ b/neutron/control/opendaylight/single.yml
 @@ -0,0 +1,15 @@
@@ -58,7 +70,7 @@ index 00000000..053f14df
 +            driver: opendaylight_v2
 diff --git a/neutron/gateway/opendaylight/single.yml b/neutron/gateway/opendaylight/single.yml
 new file mode 100644
-index 00000000..21690017
+index 0000000..2169001
 --- /dev/null
 +++ b/neutron/gateway/opendaylight/single.yml
 @@ -0,0 +1,7 @@
@@ -71,7 +83,7 @@ index 00000000..21690017
 +        ovsdb_connection: tcp:127.0.0.1:6639
 diff --git a/opendaylight/server/single.yml b/opendaylight/server/single.yml
 new file mode 100644
-index 00000000..3d11872c
+index 0000000..3d11872
 --- /dev/null
 +++ b/opendaylight/server/single.yml
 @@ -0,0 +1,2 @@
@@ -79,7 +91,7 @@ index 00000000..3d11872c
 +- service.opendaylight.server.single
 diff --git a/reclass/storage/system/opendaylight_control_single.yml b/reclass/storage/system/opendaylight_control_single.yml
 new file mode 100644
-index 00000000..ad809f59
+index 0000000..ad809f5
 --- /dev/null
 +++ b/reclass/storage/system/opendaylight_control_single.yml
 @@ -0,0 +1,13 @@