Set defaults for project-specific variables
Since neutron, nova and cinder variables are not defined in manila scope, we need to set defaults for them. Also some options are not used so there is no reason to carry them. Change-Id: I294a9dd1939f7392806ba6e1db2bf3de56cb4dcb
This commit is contained in:
parent
924fe699cd
commit
7364011f4d
|
@ -93,37 +93,31 @@ memcache_secret_key = {{ memcached_encryption_key }}
|
||||||
|
|
||||||
[neutron]
|
[neutron]
|
||||||
url = http://{{ internal_lb_vip_address }}:9696
|
url = http://{{ internal_lb_vip_address }}:9696
|
||||||
www_authenticate_uri = {{ keystone_service_internaluri }}
|
|
||||||
auth_url = {{ keystone_service_adminurl }}
|
auth_url = {{ keystone_service_adminurl }}
|
||||||
memcached_servers = {{ memcached_servers }}
|
|
||||||
auth_type = {{ manila_keystone_auth_plugin }}
|
auth_type = {{ manila_keystone_auth_plugin }}
|
||||||
project_domain_name = {{ neutron_service_domain_name | default("Default") }}
|
project_domain_name = {{ neutron_service_domain_name | default("Default") }}
|
||||||
user_domain_name = {{ neutron_service_domain_name | default("Default") }}
|
user_domain_name = {{ neutron_service_domain_name | default("Default") }}
|
||||||
region_name = {{ neutron_service_region }}
|
region_name = {{ neutron_service_region | default(manila_service_region) }}
|
||||||
project_name = {{ neutron_service_project_name }}
|
project_name = {{ neutron_service_project_name | default("service") }}
|
||||||
username = {{ neutron_service_user_name }}
|
username = {{ neutron_service_user_name | default("neutron") }}
|
||||||
password = {{ neutron_service_password }}
|
password = {{ neutron_service_password }}
|
||||||
|
|
||||||
[nova]
|
[nova]
|
||||||
www_authenticate_uri = {{ keystone_service_internaluri }}
|
|
||||||
auth_url = {{ keystone_service_adminurl }}
|
auth_url = {{ keystone_service_adminurl }}
|
||||||
memcached_servers = {{ memcached_servers }}
|
|
||||||
auth_type = {{ manila_keystone_auth_plugin }}
|
auth_type = {{ manila_keystone_auth_plugin }}
|
||||||
project_domain_name = {{ nova_service_domain_name | default("Default") }}
|
project_domain_name = {{ nova_service_domain_name | default("Default") }}
|
||||||
user_domain_name = {{ nova_service_domain_name | default("Default") }}
|
user_domain_name = {{ nova_service_domain_name | default("Default") }}
|
||||||
region_name = {{ nova_service_region }}
|
region_name = {{ nova_service_region | default(manila_service_region) }}
|
||||||
project_name = {{ nova_service_project_name }}
|
project_name = {{ nova_service_project_name | default("service") }}
|
||||||
username = {{ nova_service_user_name }}
|
username = {{ nova_service_user_name | default("nova") }}
|
||||||
password = {{ nova_service_password }}
|
password = {{ nova_service_password }}
|
||||||
|
|
||||||
[cinder]
|
[cinder]
|
||||||
www_authenticate_uri = {{ keystone_service_internaluri }}
|
|
||||||
auth_url = {{ keystone_service_adminurl }}
|
auth_url = {{ keystone_service_adminurl }}
|
||||||
memcached_servers = {{ memcached_servers }}
|
|
||||||
auth_type = {{ manila_keystone_auth_plugin }}
|
auth_type = {{ manila_keystone_auth_plugin }}
|
||||||
project_domain_name = {{ cinder_service_domain_name | default("Default") }}
|
project_domain_name = {{ cinder_service_domain_name | default("Default") }}
|
||||||
user_domain_name = {{ cinder_service_domain_name | default("Default") }}
|
user_domain_name = {{ cinder_service_domain_name | default("Default") }}
|
||||||
region_name = {{ cinder_service_region | default("RegionOne") }}
|
region_name = {{ cinder_service_region | default(manila_service_region) }}
|
||||||
project_name = {{ cinder_service_project_name | default("service") }}
|
project_name = {{ cinder_service_project_name | default("service") }}
|
||||||
username = {{ cinder_service_user_name | default("cinder") }}
|
username = {{ cinder_service_user_name | default("cinder") }}
|
||||||
password = {{ cinder_service_password | default("secrete") }}
|
password = {{ cinder_service_password }}
|
||||||
|
|
Loading…
Reference in New Issue