openstack/openstack-helm
Code Issues Proposed changes

A few more neutron override bugfixes

Browse Source
This commit is contained in:
Alan Meadows 2017-04-10 13:49:16 -07:00
parent 1cf1dd91a7
commit 3ab6767c74
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/templates/bin/_db-sync.sh.tpl
View File

@ -18,5 +18,5 @@ set -ex
neutron-db-manage \ neutron-db-manage \
--config-file /etc/neutron/neutron.conf \ --config-file /etc/neutron/neutron.conf \
--config-file /etc/neutron/plugins/ml2/ml2-conf.ini \ --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \
upgrade head upgrade head

12
neutron/templates/configmap-bin.yaml
View File

@ -17,9 +17,9 @@ kind: ConfigMap
metadata: metadata:
name: neutron-bin name: neutron-bin
data: data:
db-init.py: | db-init.py: |+
{{- include "helm-toolkit.db_init" . | indent 4 }} {{- include "helm-toolkit.db_init" . | indent 4 }}
db-sync.sh: | db-sync.sh: |+
{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} {{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.template" | indent 4 }}
ks-service.sh: |+ ks-service.sh: |+
{{- include "helm-toolkit.keystone_service" . | indent 4 }} {{- include "helm-toolkit.keystone_service" . | indent 4 }}
@ -27,11 +27,11 @@ data:
{{- include "helm-toolkit.keystone_endpoints" . | indent 4 }} {{- include "helm-toolkit.keystone_endpoints" . | indent 4 }}
ks-user.sh: |+ ks-user.sh: |+
{{- include "helm-toolkit.keystone_user" . | indent 4 }} {{- include "helm-toolkit.keystone_user" . | indent 4 }}
neutron-openvswitch-agent.sh: | neutron-openvswitch-agent.sh: |+
{{ tuple "bin/_neutron-openvswitch-agent.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} {{ tuple "bin/_neutron-openvswitch-agent.sh.tpl" . | include "helm-toolkit.template" | indent 4 }}
openvswitch-db-server.sh: | openvswitch-db-server.sh: |+
{{ tuple "bin/_openvswitch-db-server.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} {{ tuple "bin/_openvswitch-db-server.sh.tpl" . | include "helm-toolkit.template" | indent 4 }}
openvswitch-ensure-configured.sh: | openvswitch-ensure-configured.sh: |+
{{ tuple "bin/_openvswitch-ensure-configured.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} {{ tuple "bin/_openvswitch-ensure-configured.sh.tpl" . | include "helm-toolkit.template" | indent 4 }}
openvswitch-vswitchd.sh: | openvswitch-vswitchd.sh: |+
{{ tuple "bin/_openvswitch-vswitchd.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} {{ tuple "bin/_openvswitch-vswitchd.sh.tpl" . | include "helm-toolkit.template" | indent 4 }}

9
neutron/values.yaml
View File

@ -89,6 +89,7 @@ network:
port: 8775 port: 8775
keystone: keystone:
admin_user: "admin" admin_user: "admin"
admin_user_domain: "default" admin_user_domain: "default"
admin_password: "password" admin_password: "password"
@ -96,6 +97,14 @@ keystone:
admin_project_domain: "default" admin_project_domain: "default"
admin_region_name: "RegionOne" admin_region_name: "RegionOne"
neutron_user: "neutron"
neutron_user_domain: "default"
neutron_user_role: "admin"
neutron_password: "password"
neutron_project_name: "service"
neutron_project_domain: "default"
neutron_region_name: "RegionOne"
metadata_agent: metadata_agent:
default: default:
debug: 'True' debug: 'True'