starlingx/openstack-armada-app
Code Issues Proposed changes

Move neutron static configs to Armada manifest

Browse Source 
Move all neutron static configurations from the overrides to the
Armada manifest.

This is being done so we have a consistent way of managing
containerized openstack configurations. Static configurations will
be located in the Armada manifest and dynamic configuration will be
located in the overrides files.

Story: 2003909
Task: 29433

Change-Id: I5baf0bbc15912e0303955456151e69856bba0385
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
This commit is contained in:
Kristine Bujold 2019-02-12 10:03:48 -05:00
parent 8c97ed39a7
commit b7d0b3ed0c
3 changed files with 121 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stx-openstack-helm/centos/build_srpm.data
View File

@ -1,3 +1,3 @@
SRC_DIR="stx-openstack-helm"
COPY_LIST_TO_TAR="$PKG_BASE/../../../helm-charts/rbd-provisioner $PKG_BASE/../../../helm-charts/garbd"
TIS_PATCH_VER=3
TIS_PATCH_VER=4

68
stx-openstack-helm/stx-openstack-helm/manifests/manifest-no-tests.yaml
View File

@ -762,6 +762,9 @@ data:
pod:
replicas:
server: 2
user:
neutron:
uid: 0
affinity:
anti:
type:
@ -769,13 +772,13 @@ data:
labels:
agent:
dhcp:
node_selector_key: openstack-control-plane
node_selector_key: openstack-compute-node
node_selector_value: enabled
l3:
node_selector_key: openstack-control-plane
node_selector_key: openstack-compute-node
node_selector_value: enabled
metadata:
node_selector_key: openstack-control-plane
node_selector_key: openstack-compute-node
node_selector_value: enabled
job:
node_selector_key: openstack-control-plane
@ -798,19 +801,68 @@ data:
node_selector_value: enabled
network:
interface:
tunnel: enp0s3
tunnel: docker0
backend:
- openvswitch
- sriov
conf:
neutron:
DEFAULT:
l3_ha: true
min_l3_agents_per_router: 2
max_l3_agents_per_router: 5
l3_ha: false
min_l3_agents_per_router: 1
max_l3_agents_per_router: 1
l3_ha_network_type: vxlan
dhcp_agents_per_network: 2
dhcp_agents_per_network: 1
max_overflow: 64
max_pool_size: 1
idle_timeout: 60
router_status_managed: true
vlan_transparent: true
wsgi_default_pool_size: 100
notify_nova_on_port_data_changes: true
notify_nova_on_port_status_changes: true
control_exchange: neutron
core_plugin: neutron.plugins.ml2.plugin.Ml2Plugin
state_path: /var/run/neutron
syslog_log_facility: local2
use_syslog: true
pnet_audit_enabled: false
driver: messagingv2
enable_proxy_headers_parsing: true
lock_path: /var/run/neutron/lock
log_format: '[%(name)s] %(message)s'
policy_file: /etc/neutron/policy.json
service_plugins: router
dns_domain: openstacklocal
enable_new_agents: false
allow_automatic_dhcp_failover: true
allow_automatic_l3agent_failover: true
agent:
root_helper: sudo
vhost:
vhost_user_enabled: false
dhcp_agent:
DEFAULT:
enable_isolated_metadata: true
enable_metadata_network: false
interface_driver: openvswitch
resync_interval: 30
l3_agent:
DEFAULT:
agent_mode: dvr_snat
interface_driver: openvswitch
metadata_port: 80
plugins:
ml2_conf:
ml2_type_flat:
flat_networks: public
ml2:
mechanism_drivers: openvswitch,sriovnicswitch,l2population
path_mtu: 0
tenant_network_types: vlan,vxlan
type_drivers: managed_flat,managed_vlan,managed_vxlan
securitygroup:
firewall_driver: noop
openvswitch_agent:
agent:
tunnel_types: vxlan

68
stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml
View File

@ -762,6 +762,9 @@ data:
pod:
replicas:
server: 2
user:
neutron:
uid: 0
affinity:
anti:
type:
@ -769,13 +772,13 @@ data:
labels:
agent:
dhcp:
node_selector_key: openstack-control-plane
node_selector_key: openstack-compute-node
node_selector_value: enabled
l3:
node_selector_key: openstack-control-plane
node_selector_key: openstack-compute-node
node_selector_value: enabled
metadata:
node_selector_key: openstack-control-plane
node_selector_key: openstack-compute-node
node_selector_value: enabled
job:
node_selector_key: openstack-control-plane
@ -798,19 +801,68 @@ data:
node_selector_value: enabled
network:
interface:
tunnel: enp0s3
tunnel: docker0
backend:
- openvswitch
- sriov
conf:
neutron:
DEFAULT:
l3_ha: true
min_l3_agents_per_router: 2
max_l3_agents_per_router: 5
l3_ha: false
min_l3_agents_per_router: 1
max_l3_agents_per_router: 1
l3_ha_network_type: vxlan
dhcp_agents_per_network: 2
dhcp_agents_per_network: 1
max_overflow: 64
max_pool_size: 1
idle_timeout: 60
router_status_managed: true
vlan_transparent: true
wsgi_default_pool_size: 100
notify_nova_on_port_data_changes: true
notify_nova_on_port_status_changes: true
control_exchange: neutron
core_plugin: neutron.plugins.ml2.plugin.Ml2Plugin
state_path: /var/run/neutron
syslog_log_facility: local2
use_syslog: true
pnet_audit_enabled: false
driver: messagingv2
enable_proxy_headers_parsing: true
lock_path: /var/run/neutron/lock
log_format: '[%(name)s] %(message)s'
policy_file: /etc/neutron/policy.json
service_plugins: router
dns_domain: openstacklocal
enable_new_agents: false
allow_automatic_dhcp_failover: true
allow_automatic_l3agent_failover: true
agent:
root_helper: sudo
vhost:
vhost_user_enabled: false
dhcp_agent:
DEFAULT:
enable_isolated_metadata: true
enable_metadata_network: false
interface_driver: openvswitch
resync_interval: 30
l3_agent:
DEFAULT:
agent_mode: dvr_snat
interface_driver: openvswitch
metadata_port: 80
plugins:
ml2_conf:
ml2_type_flat:
flat_networks: public
ml2:
mechanism_drivers: openvswitch,sriovnicswitch,l2population
path_mtu: 0
tenant_network_types: vlan,vxlan
type_drivers: managed_flat,managed_vlan,managed_vxlan
securitygroup:
firewall_driver: noop
openvswitch_agent:
agent:
tunnel_types: vxlan