diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-02 23:22:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-02 23:22:25 +0000 |
| commit | 2e7b6eeac034f74b822d6e1d7fd34cc51c38ebfc (patch) | |
| tree | 8a77e008d9237f4d07a0dab0c0646f93788ed57e /etc | |
| parent | d5d1b1b3ddb3802e992b39a9df383dfc5dd9753d (diff) | |
| parent | 9786fd646f1be0354eb8dd8f8cbe6f68a9e26653 (diff) | |
| download | kolla-2e7b6eeac034f74b822d6e1d7fd34cc51c38ebfc.tar.gz kolla-2e7b6eeac034f74b822d6e1d7fd34cc51c38ebfc.zip | |
Merge "Add ansible support for Manila"
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/kolla/globals.yml | 6 | ||||
| -rw-r--r-- | etc/kolla/passwords.yml | 11 |
2 files changed, 17 insertions, 0 deletions
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index f286e96bf..44f72ead7 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -99,3 +99,9 @@ neutron_external_interface: "eth1" # A requirement for using the erasure-coded pools is you must setup a cache tier # Valid options are [ erasure, replicated ] # ceph_pool_type: "replicated" + + +####################################### +# Manila - Shared File Systems Options +####################################### +# manila_enable_dhss: "yes" diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml index 7dc9626de..b0c2d9965 100644 --- a/etc/kolla/passwords.yml +++ b/etc/kolla/passwords.yml @@ -64,6 +64,17 @@ mistral_keystone_password: "password" horizon_secret_key: "password" +manila_database_password: "password" +manila_keystone_password: "password" + + +#################### +# Manila options +#################### +service_instance_password: "manila" +service_instance_user: "manila" + + #################### # RabbitMQ options #################### |