openstack/openstack-helm
Code Issues Proposed changes

Gate: Fix armada neutron deployment

Browse Source 
This PS updates the armada neutron deployment to reflect the removal
of the hacked oslo-genconfig tool.

Change-Id: Id3dbe1775a57a5833fd500d8ab6236d4792f8784
This commit is contained in:
Pete Birley 2017-09-25 17:10:52 -05:00
parent 7cdb1782ac
commit 3c0755ec1b
2 changed files with 18 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/deployment/armada/openstack-master-aio.yaml
View File

@ -574,12 +574,7 @@ data:
tunnel: docker0 tunnel: docker0
conf: conf:
neutron: neutron:
default: DEFAULT:
oslo:
log:
debug: false
neutron:
db:
l3_ha: False l3_ha: False
min_l3_agents_per_router: 1 min_l3_agents_per_router: 1
max_l3_agents_per_router: 1 max_l3_agents_per_router: 1
@ -587,23 +582,11 @@ data:
dhcp_agents_per_network: 1 dhcp_agents_per_network: 1
ml2_conf: ml2_conf:
ml2_type_flat: ml2_type_flat:
neutron:
ml2:
flat_networks: public flat_networks: public
openvswitch_agent: openvswitch_agent:
agent:
neutron:
ml2:
ovs:
agent: agent:
tunnel_types: vxlan tunnel_types: vxlan
ovs: ovs:
neutron:
ml2:
ovs:
agent:
of_interface: ovs-ofctl
ovsdb_interface: vsctl
bridge_mappings: public:br-ex bridge_mappings: public:br-ex
source: source:
type: local type: local

19
tools/deployment/armada/openstack-master.yaml
View File

@ -553,12 +553,7 @@ data:
tunnel: docker0 tunnel: docker0
conf: conf:
neutron: neutron:
default: DEFAULT:
oslo:
log:
debug: false
neutron:
db:
l3_ha: False l3_ha: False
min_l3_agents_per_router: 1 min_l3_agents_per_router: 1
max_l3_agents_per_router: 1 max_l3_agents_per_router: 1
@ -566,23 +561,11 @@ data:
dhcp_agents_per_network: 1 dhcp_agents_per_network: 1
ml2_conf: ml2_conf:
ml2_type_flat: ml2_type_flat:
neutron:
ml2:
flat_networks: public flat_networks: public
openvswitch_agent: openvswitch_agent:
agent:
neutron:
ml2:
ovs:
agent: agent:
tunnel_types: vxlan tunnel_types: vxlan
ovs: ovs:
neutron:
ml2:
ovs:
agent:
of_interface: ovs-ofctl
ovsdb_interface: vsctl
bridge_mappings: public:br-ex bridge_mappings: public:br-ex
source: source:
type: local type: local