diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-07 07:26:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-07 07:26:38 +0000 |
| commit | 00ffed38727b9f5b09562777d75f42e096f8bc36 (patch) | |
| tree | e196f9204bb40f9917d7faa6c69775bf566b0bbc /etc/kolla | |
| parent | 9d9f3eea04a57798817d16635a08860e778535ef (diff) | |
| parent | d3d3472326598b89a2d589e4446ac167d989521a (diff) | |
| download | kolla-00ffed38727b9f5b09562777d75f42e096f8bc36.tar.gz kolla-00ffed38727b9f5b09562777d75f42e096f8bc36.zip | |
Merge "Implement Ansible rally role"
Diffstat (limited to 'etc/kolla')
| -rw-r--r-- | etc/kolla/globals.yml | 2 | ||||
| -rw-r--r-- | etc/kolla/passwords.yml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 554ef1e66..a5a575de4 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -140,11 +140,11 @@ kolla_internal_vip_address: "10.10.10.254" #enable_neutron_lbaas: "no" #enable_neutron_qos: "no" #enable_neutron_agent_ha: "no" +#enable_rally: "no" #enable_swift: "no" #enable_tempest: "no" #enable_watcher: "no" - ################### # Ceph options ################### diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml index b635c6851..b54a33c02 100644 --- a/etc/kolla/passwords.yml +++ b/etc/kolla/passwords.yml @@ -73,6 +73,8 @@ watcher_keystone_password: congress_database_password: congress_keystone_password: +rally_database_password: + horizon_secret_key: telemetry_secret_key: |