openstack/kolla-ansible
Code Issues Proposed changes

Merge "Move manila variable"

Browse Source
This commit is contained in:
Jenkins 2016-03-21 10:05:13 +00:00 committed by Gerrit Code Review
commit cfbd96bbb9
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/manila/defaults/main.yml
View File

@ -38,7 +38,7 @@ manila_v2_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{
manila_logging_debug: "{{ openstack_logging_debug }}" manila_logging_debug: "{{ openstack_logging_debug }}"
manila_keystone_user: "manila" manila_keystone_user: "manila"
manila_service_instance_user: "manila"
manila_tenant_name: "manila_tenant" 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 }}'}" openstack_manila_auth: "{'auth_url':'{{ openstack_auth.auth_url }}','username':'{{ openstack_auth.username }}','password':'{{ openstack_auth.password }}','project_name':'{{ openstack_auth.project_name }}'}"

4
ansible/roles/manila/templates/manila.conf.j2
View File

@ -67,8 +67,8 @@ driver_handles_share_servers = False
# service VMs in Nova. And following are data for some specific image. # service VMs in Nova. And following are data for some specific image.
# We used one defined in [1] # We used one defined in [1]
# [1] https://github.com/openstack/manila/blob/6785cad9/devstack/plugin.sh#L86 # [1] https://github.com/openstack/manila/blob/6785cad9/devstack/plugin.sh#L86
service_instance_password = {{ service_instance_password }} service_instance_password = {{ manila_service_instance_password }}
service_instance_user = {{ service_instance_user }} service_instance_user = {{ manila_service_instance_user }}
service_image_name = manila-service-image service_image_name = manila-service-image
# These will be used for keypair creation and inserted into service VMs. # These will be used for keypair creation and inserted into service VMs.

7
etc/kolla/passwords.yml
View File

@ -69,13 +69,6 @@ manila_keystone_password: "password"
memcache_secret_key: "password" memcache_secret_key: "password"
####################
# Manila options
####################
service_instance_password: "manila"
service_instance_user: "manila"
#################### ####################
# RabbitMQ options # RabbitMQ options
#################### ####################