diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-14 18:14:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-14 18:14:58 +0000 |
| commit | d438e1ca13ba01a8ea7a8519a4549026b933722c (patch) | |
| tree | 2f3b1cc895bb9ef6d4493176ecbe347587f9df8b /etc/kolla | |
| parent | ad2d6567a6d55ef2e08dff7ebfc0bc9f3f3d6998 (diff) | |
| parent | fe61591a7c45dde56fcac3b013b8fb604c66d176 (diff) | |
| download | kolla-d438e1ca13ba01a8ea7a8519a4549026b933722c.tar.gz kolla-d438e1ca13ba01a8ea7a8519a4549026b933722c.zip | |
Merge "Added grafana role"
Diffstat (limited to 'etc/kolla')
| -rw-r--r-- | etc/kolla/globals.yml | 1 | ||||
| -rw-r--r-- | etc/kolla/passwords.yml | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index a21090267..2a320cf99 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -121,6 +121,7 @@ kolla_internal_vip_address: "10.10.10.254" #enable_cinder_backend_lvm: "no" #enable_cloudkitty: "no" #enable_congress: "no" +#enable_grafana: "no" #enable_heat: "yes" #enable_horizon: "yes" #enable_influxdb: "no" diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml index c31a9805f..84b1b7786 100644 --- a/etc/kolla/passwords.yml +++ b/etc/kolla/passwords.yml @@ -30,6 +30,9 @@ barbican_keystone_password: keystone_admin_password: keystone_database_password: +grafana_database_password: +grafana_admin_password: + glance_database_password: glance_keystone_password: |