diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-14 15:01:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-14 15:01:34 +0000 |
| commit | d3302a7e695dcb9f8f5c991a1722621a418b81b3 (patch) | |
| tree | 54822b44e3d1d7f2ce85d7bcccf2dc2cdd077a71 /etc/kolla | |
| parent | 557c02fe778ebf648753830fd0d42f19a23a021f (diff) | |
| parent | abf83650a15fe4eb4c80210ef1f14df8bf71996f (diff) | |
| download | kolla-d3302a7e695dcb9f8f5c991a1722621a418b81b3.tar.gz kolla-d3302a7e695dcb9f8f5c991a1722621a418b81b3.zip | |
Merge "Add Senlin Ansible 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 541587495..26ddbddf7 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -135,6 +135,7 @@ kolla_internal_vip_address: "10.10.10.254" #enable_neutron_qos: "no" #enable_neutron_agent_ha: "no" #enable_rally: "no" +#enable_senlin: "no" #enable_swift: "no" #enable_tempest: "no" #enable_watcher: "no" diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml index e570a9d90..c31a9805f 100644 --- a/etc/kolla/passwords.yml +++ b/etc/kolla/passwords.yml @@ -84,6 +84,9 @@ congress_keystone_password: rally_database_password: +senlin_database_password: +senlin_keystone_password: + horizon_secret_key: telemetry_secret_key: |
