openstack/openstack-helm
Code Issues Proposed changes

Merge "Add missing passwords to armada-osh manifest"

Browse Source
This commit is contained in:
Zuul 2019-06-04 16:41:43 +00:00 committed by Gerrit Code Review
commit 2132a98956
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/deployment/armada/generate-osh-passwords.sh
View File

@ -21,29 +21,37 @@ passwords="BARBICAN_DB_PASSWORD \
BARBICAN_USER_PASSWORD \ BARBICAN_USER_PASSWORD \
CINDER_DB_PASSWORD \ CINDER_DB_PASSWORD \
CINDER_RABBITMQ_USER_PASSWORD \ CINDER_RABBITMQ_USER_PASSWORD \
CINDER_TEST_USER_PASSWORD \
CINDER_USER_PASSWORD \ CINDER_USER_PASSWORD \
GLANCE_DB_PASSWORD \ GLANCE_DB_PASSWORD \
GLANCE_RABBITMQ_USER_PASSWORD \ GLANCE_RABBITMQ_USER_PASSWORD \
GLANCE_TEST_USER_PASSWORD \
GLANCE_USER_PASSWORD \ GLANCE_USER_PASSWORD \
HEAT_DB_PASSWORD \ HEAT_DB_PASSWORD \
HEAT_RABBITMQ_USER_PASSWORD \ HEAT_RABBITMQ_USER_PASSWORD \
HEAT_STACK_PASSWORD \ HEAT_STACK_PASSWORD \
HEAT_TEST_USER_PASSWORD \
HEAT_TRUSTEE_PASSWORD \ HEAT_TRUSTEE_PASSWORD \
HEAT_USER_PASSWORD \ HEAT_USER_PASSWORD \
KEYSTONE_ADMIN_PASSWORD \ KEYSTONE_ADMIN_PASSWORD \
KEYSTONE_AUTHTOKEN_MEMCACHED_SECRET_KEY \ KEYSTONE_AUTHTOKEN_MEMCACHED_SECRET_KEY \
KEYSTONE_DB_PASSWORD \ KEYSTONE_DB_PASSWORD \
KEYSTONE_RABBITMQ_USER_PASSWORD \ KEYSTONE_RABBITMQ_USER_PASSWORD \
KEYSTONE_TEST_USER_PASSWORD \
METADATA_PROXY_SHARED_SECRET \ METADATA_PROXY_SHARED_SECRET \
NEUTRON_DB_PASSWORD \ NEUTRON_DB_PASSWORD \
NEUTRON_RABBITMQ_USER_PASSWORD \ NEUTRON_RABBITMQ_USER_PASSWORD \
NEUTRON_TEST_USER_PASSWORD \
NEUTRON_USER_PASSWORD \ NEUTRON_USER_PASSWORD \
NOVA_DB_PASSWORD \ NOVA_DB_PASSWORD \
NOVA_PLACEMENT_USER_PASSWORD \ NOVA_PLACEMENT_USER_PASSWORD \
NOVA_RABBITMQ_USER_PASSWORD \ NOVA_RABBITMQ_USER_PASSWORD \
NOVA_TEST_USER_PASSWORD \
NOVA_USER_PASSWORD \ NOVA_USER_PASSWORD \
OPENSTACK_EXPORTER_USER_PASSWORD \ OPENSTACK_EXPORTER_USER_PASSWORD \
OSH_MARIADB_ADMIN_PASSWORD \ OSH_MARIADB_ADMIN_PASSWORD \
OSH_MARIADB_EXPORTER_PASSWORD \
OSH_MARIADB_SST_PASSWORD \
RABBITMQ_ADMIN_PASSWORD \ RABBITMQ_ADMIN_PASSWORD \
SWIFT_USER_PASSWORD" SWIFT_USER_PASSWORD"

16
tools/deployment/armada/manifests/armada-osh.yaml
View File

@ -137,6 +137,10 @@ data:
auth: auth:
admin: admin:
password: ${OSH_MARIADB_ADMIN_PASSWORD} password: ${OSH_MARIADB_ADMIN_PASSWORD}
exporter:
password: ${OSH_MARIADB_EXPORTER_PASSWORD}
sst:
password: ${OSH_MARIADB_SST_PASSWORD}
monitoring: monitoring:
prometheus: prometheus:
enabled: True enabled: True
@ -290,6 +294,8 @@ data:
auth: auth:
admin: admin:
password: ${KEYSTONE_ADMIN_PASSWORD} password: ${KEYSTONE_ADMIN_PASSWORD}
test:
password: ${KEYSTONE_TEST_USER_PASSWORD}
oslo_cache: oslo_cache:
auth: auth:
memcache_secret_key: ${KEYSTONE_AUTHTOKEN_MEMCACHED_SECRET_KEY} memcache_secret_key: ${KEYSTONE_AUTHTOKEN_MEMCACHED_SECRET_KEY}
@ -430,6 +436,8 @@ data:
password: ${KEYSTONE_ADMIN_PASSWORD} password: ${KEYSTONE_ADMIN_PASSWORD}
glance: glance:
password: ${GLANCE_USER_PASSWORD} password: ${GLANCE_USER_PASSWORD}
test:
password: ${GLANCE_TEST_USER_PASSWORD}
oslo_db: oslo_db:
auth: auth:
admin: admin:
@ -511,6 +519,8 @@ data:
password: ${KEYSTONE_ADMIN_PASSWORD} password: ${KEYSTONE_ADMIN_PASSWORD}
cinder: cinder:
password: ${CINDER_USER_PASSWORD} password: ${CINDER_USER_PASSWORD}
test:
password: ${CINDER_TEST_USER_PASSWORD}
oslo_db: oslo_db:
auth: auth:
admin: admin:
@ -698,6 +708,8 @@ data:
password: ${NEUTRON_USER_PASSWORD} password: ${NEUTRON_USER_PASSWORD}
placement: placement:
password: ${NOVA_PLACEMENT_USER_PASSWORD} password: ${NOVA_PLACEMENT_USER_PASSWORD}
test:
password: ${NOVA_TEST_USER_PASSWORD}
oslo_db: oslo_db:
auth: auth:
admin: admin:
@ -841,6 +853,8 @@ data:
password: ${NEUTRON_USER_PASSWORD} password: ${NEUTRON_USER_PASSWORD}
nova: nova:
password: ${NOVA_USER_PASSWORD} password: ${NOVA_USER_PASSWORD}
test:
password: ${NEUTRON_TEST_USER_PASSWORD}
oslo_db: oslo_db:
auth: auth:
admin: admin:
@ -962,6 +976,8 @@ data:
password: ${HEAT_TRUSTEE_PASSWORD} password: ${HEAT_TRUSTEE_PASSWORD}
heat_stack_user: heat_stack_user:
password: ${HEAT_STACK_PASSWORD} password: ${HEAT_STACK_PASSWORD}
test:
password: ${HEAT_TEST_USER_PASSWORD}
oslo_db: oslo_db:
auth: auth:
admin: admin: