Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "docs: Update release documentation"
[fuel.git]
/
mcp
/
reclass
/
classes
/
cluster
/
virtual-mcp-ocata-common
/
openstack_gateway.yml
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
index
9262590
..
c6e2b7e
100644
(file)
--- a/
mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
+++ b/
mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
@@
-1,12
+1,12
@@
+---
classes:
classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+ - system.linux.system.repo.mcp.openstack
+ - system.linux.system.repo.mcp.extra
parameters:
_param:
parameters:
_param:
- primary_interface:
ens4
- tenant_interface:
ens5
- external_interface:
ens6
+ primary_interface:
${_param:opnfv_fn_vm_secondary_interface}
+ tenant_interface:
${_param:opnfv_fn_vm_tertiary_interface}
+ external_interface:
${_param:opnfv_fn_vm_quaternary_interface}
interface_mtu: 9000
linux_system_codename: xenial
neutron:
interface_mtu: 9000
linux_system_codename: xenial
neutron:
@@
-19,7
+19,7
@@
parameters:
interface:
dhcp_int:
enabled: true
interface:
dhcp_int:
enabled: true
- name:
ens3
+ name:
${_param:opnfv_fn_vm_primary_interface}
proto: dhcp
type: eth
mtu: ${_param:interface_mtu}
proto: dhcp
type: eth
mtu: ${_param:interface_mtu}
@@
-53,7
+53,7
@@
parameters:
netmask: 255.255.255.0
mtu: ${_param:interface_mtu}
use_interfaces:
netmask: 255.255.255.0
mtu: ${_param:interface_mtu}
use_interfaces:
- - ${_param:primary_interface}
+
- ${_param:primary_interface}
float-to-ex:
enabled: true
type: ovs_port
float-to-ex:
enabled: true
type: ovs_port
@@
-66,6
+66,6
@@
parameters:
address: ${_param:external_address}
netmask: 255.255.255.0
use_interfaces:
address: ${_param:external_address}
netmask: 255.255.255.0
use_interfaces:
- - ${_param:external_interface}
+
- ${_param:external_interface}
use_ovs_ports:
use_ovs_ports:
- - float-to-ex
+
- float-to-ex