diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-22 04:00:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-22 04:00:28 +0000 |
| commit | ce3abeb0ebd3ef682315cc4d76db32cffb083248 (patch) | |
| tree | 434fa5b67efef7963961072f85cbaa06dcb7fea2 /etc | |
| parent | a2c6eefdde5f334ea43e36fba2acad4cd23a6046 (diff) | |
| parent | d3f65a812f807cda9f27af0cf808de8be8acacf6 (diff) | |
| download | kolla-ce3abeb0ebd3ef682315cc4d76db32cffb083248.tar.gz kolla-ce3abeb0ebd3ef682315cc4d76db32cffb083248.zip | |
Merge "Allow use of database for Horizon sessions"
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/kolla/globals.yml | 6 | ||||
| -rw-r--r-- | etc/kolla/passwords.yml | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 13fcfc26f..bfb3d7d50 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -207,6 +207,12 @@ kolla_internal_vip_address: "10.10.10.254" #nova_backend_ceph: "{{ enable_ceph }}" +####################### +# Horizon options +####################### +#horizon_backend_database: "no" + + ####################################### # Manila - Shared File Systems Options ####################################### diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml index e7799c4ad..93a54f55e 100644 --- a/etc/kolla/passwords.yml +++ b/etc/kolla/passwords.yml @@ -93,6 +93,7 @@ senlin_database_password: senlin_keystone_password: horizon_secret_key: +horizon_database_password: telemetry_secret_key: |