openstack/kolla-ansible
Code Issues Proposed changes

Move neutron options from group "DEFAULT" to group "generic"

Browse Source 
Change-Id: I0d62a7303e7336c3e4a43c4eec284605fda5d125
Closes-Bug:#1557037
This commit is contained in:
Mauricio Lima 2016-03-14 12:22:09 -04:00
parent 41efde9edb
commit 4d89dd4e5c
1 changed files with 6 additions and 6 deletions

12
ansible/roles/manila/templates/manila.conf.j2

@ -23,12 +23,6 @@ auth_strategy = keystone
os_region_name = {{ openstack_region_name }} os_region_name = {{ openstack_region_name }}
neutron_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ neutron_server_port }}
neutron_admin_auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v2.0
neutron_admin_project_name = service
neutron_admin_username = {{ neutron_keystone_user }}
neutron_admin_password = {{ neutron_keystone_password }}
cinder_admin_auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v2.0 cinder_admin_auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v2.0
cinder_admin_tenant_name = service cinder_admin_tenant_name = service
cinder_admin_username = cinder cinder_admin_username = cinder
@ -44,6 +38,12 @@ nova_admin_password = {{ nova_keystone_password }}
# This one is used only when enabled using opt `enabled_share_backends` # This one is used only when enabled using opt `enabled_share_backends`
# from DEFAULT group. # from DEFAULT group.
neutron_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ neutron_server_port }}
neutron_admin_auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v2.0
neutron_admin_project_name = service
neutron_admin_username = {{ neutron_keystone_user }}
neutron_admin_password = {{ neutron_keystone_password }}
# Set usage of Generic driver which uses Cinder as backend. # Set usage of Generic driver which uses Cinder as backend.
share_driver = manila.share.drivers.generic.GenericShareDriver share_driver = manila.share.drivers.generic.GenericShareDriver