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

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

@ -574,37 +574,20 @@ data:
tunnel: docker0 tunnel: docker0
conf: conf:
neutron: neutron:
default: DEFAULT:
oslo: l3_ha: False
log: min_l3_agents_per_router: 1
debug: false max_l3_agents_per_router: 1
neutron: l3_ha_network_type: vxlan
db: dhcp_agents_per_network: 1
l3_ha: False
min_l3_agents_per_router: 1
max_l3_agents_per_router: 1
l3_ha_network_type: vxlan
dhcp_agents_per_network: 1
ml2_conf: ml2_conf:
ml2_type_flat: ml2_type_flat:
neutron: flat_networks: public
ml2:
flat_networks: public
openvswitch_agent: openvswitch_agent:
agent: agent:
neutron: tunnel_types: vxlan
ml2:
ovs:
agent:
tunnel_types: vxlan
ovs: ovs:
neutron: bridge_mappings: public:br-ex
ml2:
ovs:
agent:
of_interface: ovs-ofctl
ovsdb_interface: vsctl
bridge_mappings: public:br-ex
source: source:
type: local type: local
location: /opt/openstack-helm/charts location: /opt/openstack-helm/charts

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

@ -553,37 +553,20 @@ data:
tunnel: docker0 tunnel: docker0
conf: conf:
neutron: neutron:
default: DEFAULT:
oslo: l3_ha: False
log: min_l3_agents_per_router: 1
debug: false max_l3_agents_per_router: 1
neutron: l3_ha_network_type: vxlan
db: dhcp_agents_per_network: 1
l3_ha: False
min_l3_agents_per_router: 1
max_l3_agents_per_router: 1
l3_ha_network_type: vxlan
dhcp_agents_per_network: 1
ml2_conf: ml2_conf:
ml2_type_flat: ml2_type_flat:
neutron: flat_networks: public
ml2:
flat_networks: public
openvswitch_agent: openvswitch_agent:
agent: agent:
neutron: tunnel_types: vxlan
ml2:
ovs:
agent:
tunnel_types: vxlan
ovs: ovs:
neutron: bridge_mappings: public:br-ex
ml2:
ovs:
agent:
of_interface: ovs-ofctl
ovsdb_interface: vsctl
bridge_mappings: public:br-ex
source: source:
type: local type: local
location: /opt/openstack-helm/charts location: /opt/openstack-helm/charts