Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[ovs] Start ovs services before networking
[fuel.git]
/
mcp
/
reclass
/
classes
/
cluster
/
mcp-odl-noha
/
openstack
/
gateway.yml.j2
diff --git
a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2
b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2
index
bbd70ca
..
93313ad
100644
(file)
--- a/
mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2
+++ b/
mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2
@@
-18,7
+18,10
@@
parameters:
network:
interface:
{%- if '-ovs-' in conf.MCP_DEPLOY_SCENARIO %}
network:
interface:
{%- if '-ovs-' in conf.MCP_DEPLOY_SCENARIO %}
- {{ nm.cmp001.nic_private }}:
+ {{ nm.ctl01.nic_private }}:
+ ovs_port_type: OVSPort
+ type: ovs_port
+ bridge: br-prv
ovs_bridge: br-prv
br-prv:
enabled: true
ovs_bridge: br-prv
br-prv:
enabled: true
@@
-27,6
+30,8
@@
parameters:
proto: static
address: ${_param:tenant_address}
netmask: ${_param:opnfv_net_private_mask}
proto: static
address: ${_param:tenant_address}
netmask: ${_param:opnfv_net_private_mask}
+ use_interfaces:
+ - {{ nm.ctl01.nic_private }}
{%- else %}
br-mesh:
enabled: true
{%- else %}
br-mesh:
enabled: true
@@
-36,5
+41,5
@@
parameters:
address: ${_param:tenant_address}
netmask: ${_param:opnfv_net_private_mask}
use_interfaces:
address: ${_param:tenant_address}
netmask: ${_param:opnfv_net_private_mask}
use_interfaces:
- - {{ ma.interface_str(nm.c
mp0
01.nic_private, vlan_private_start) }}
+ - {{ ma.interface_str(nm.c
tl
01.nic_private, vlan_private_start) }}
{%- endif %}
{%- endif %}