vexxhost/openstack-operator
Code Issues Proposed changes

Merge "Add a secret for magnum"

Browse Source
This commit is contained in:
Zuul 2020-07-08 02:32:59 +00:00 committed by Gerrit Code Review
commit d0928ca4df
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/lib/magnum
View File

@ -255,8 +255,10 @@ function create_magnum_cache_dir {
# init_magnum() - Initialize databases, etc. # init_magnum() - Initialize databases, etc.
function init_magnum { function init_magnum {
# NOTE: Permissions here are bad but it's temporary so we don't care as much. kubectl create secret generic magnum-config --from-file=/etc/magnum/magnum.conf --from-file=/etc/magnum/api-paste.ini -n openstack
sudo chmod -Rv 777 /etc/heat
# NOTE: Permissions here are bad but it's temporary so we don't care as much.
sudo chmod -Rv 777 /etc/magnum
# Only do this step once on the API node for an entire cluster. # Only do this step once on the API node for an entire cluster.
if is_service_enabled $DATABASE_BACKENDS; then if is_service_enabled $DATABASE_BACKENDS; then
# (Re)create magnum database # (Re)create magnum database

5
openstack_operator/templates/magnum/deployment.yml.j2
View File

@ -95,9 +95,8 @@ spec:
mountPath: /etc/uwsgi mountPath: /etc/uwsgi
volumes: volumes:
- name: config - name: config
hostPath: secret:
path: {{ spec['configDir'] }} secretName: magnum-config
type: Directory
- name: uwsgi-config - name: uwsgi-config
configMap: configMap:
defaultMode: 420 defaultMode: 420