diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-21 10:05:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-21 10:05:13 +0000 |
| commit | cfbd96bbb9ec2ee9d0983c4997e1f6300e61c7c1 (patch) | |
| tree | 893ba797bd34232e1a9c59e24a19f11c8d89cbc2 | |
| parent | c14007578fd2b65afe0fe9ad7c25ef747be2ca40 (diff) | |
| parent | d786ac948a9e897d5c181270342e528e3fbeb7ad (diff) | |
| download | kolla-cfbd96bbb9ec2ee9d0983c4997e1f6300e61c7c1.tar.gz kolla-cfbd96bbb9ec2ee9d0983c4997e1f6300e61c7c1.zip | |
Merge "Move manila variable"
| -rw-r--r-- | ansible/roles/manila/defaults/main.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/manila/templates/manila.conf.j2 | 4 | ||||
| -rw-r--r-- | etc/kolla/passwords.yml | 7 |
3 files changed, 4 insertions, 11 deletions
diff --git a/ansible/roles/manila/defaults/main.yml b/ansible/roles/manila/defaults/main.yml index 58f8cdd5b..664f88be0 100644 --- a/ansible/roles/manila/defaults/main.yml +++ b/ansible/roles/manila/defaults/main.yml @@ -38,7 +38,7 @@ manila_v2_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ manila_logging_debug: "{{ openstack_logging_debug }}" manila_keystone_user: "manila" - -manila_tenant_name: "manila_tenant" +manila_service_instance_user: "manila" +manila_service_instance_password: "manila" openstack_manila_auth: "{'auth_url':'{{ openstack_auth.auth_url }}','username':'{{ openstack_auth.username }}','password':'{{ openstack_auth.password }}','project_name':'{{ openstack_auth.project_name }}'}" diff --git a/ansible/roles/manila/templates/manila.conf.j2 b/ansible/roles/manila/templates/manila.conf.j2 index ab4013980..5f1ff9fa7 100644 --- a/ansible/roles/manila/templates/manila.conf.j2 +++ b/ansible/roles/manila/templates/manila.conf.j2 @@ -67,8 +67,8 @@ driver_handles_share_servers = False # service VMs in Nova. And following are data for some specific image. # We used one defined in [1] # [1] https://github.com/openstack/manila/blob/6785cad9/devstack/plugin.sh#L86 -service_instance_password = {{ service_instance_password }} -service_instance_user = {{ service_instance_user }} +service_instance_password = {{ manila_service_instance_password }} +service_instance_user = {{ manila_service_instance_user }} service_image_name = manila-service-image # These will be used for keypair creation and inserted into service VMs. diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml index 626a7ae42..a98911c3b 100644 --- a/etc/kolla/passwords.yml +++ b/etc/kolla/passwords.yml @@ -70,13 +70,6 @@ manila_keystone_password: "password" memcache_secret_key: "password" #################### -# Manila options -#################### -service_instance_password: "manila" -service_instance_user: "manila" - - -#################### # RabbitMQ options #################### rabbitmq_password: "password" |