From 89eca50630100f2bd07acc4b659d776da1fe4417 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 12 Mar 2015 18:29:05 +0000 Subject: Minimize cinder conf variables --- openstack/usr/share/openstack/cinder.yml | 12 ++--- openstack/usr/share/openstack/cinder/cinder.conf | 67 ++---------------------- 2 files changed, 11 insertions(+), 68 deletions(-) (limited to 'openstack/usr/share/openstack') diff --git a/openstack/usr/share/openstack/cinder.yml b/openstack/usr/share/openstack/cinder.yml index c926ea3b..35e7a4f8 100644 --- a/openstack/usr/share/openstack/cinder.yml +++ b/openstack/usr/share/openstack/cinder.yml @@ -37,9 +37,9 @@ name=cinderv1 type=volume description="Openstack Block Storage" - publicurl={{ CINDER_PUBLIC_URL }} - internalurl={{ CINDER_INTERNAL_URL | default('http://127.0.0.1:8776/v1/%(tenant_id)s') }} - adminurl={{ CINDER_ADMIN_URL }} + publicurl='http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v1/%(tenant_id)s' + internalurl='http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v1/%(tenant_id)s' + adminurl='http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v1/%(tenant_id)s' region='RegionOne' token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }} @@ -47,9 +47,9 @@ name=cinderv2 type=volume description="Openstack Block Storage" - publicurl={{ CINDER_PUBLIC_URL_V2 }} - internalurl={{ CINDER_INTERNAL_URL_V2 | default('http://127.0.0.1:8776/v2/%(tenant_id)s') }} - adminurl={{ CINDER_ADMIN_URL_V2 }} + publicurl='http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v2/%(tenant_id)s' + internalurl='http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v2/%(tenant_id)s' + adminurl='http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v2/%(tenant_id)s' region='RegionOne' token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }} diff --git a/openstack/usr/share/openstack/cinder/cinder.conf b/openstack/usr/share/openstack/cinder/cinder.conf index b79a2ed4..924140f7 100644 --- a/openstack/usr/share/openstack/cinder/cinder.conf +++ b/openstack/usr/share/openstack/cinder/cinder.conf @@ -495,10 +495,10 @@ api_paste_config=api-paste.ini #state_path=/var/lib/cinder # IP address of this host (string value) -my_ip={{ GLANCE_HOST }} +my_ip={{ MANAGEMENT_INTERFACE_IP_ADDRESS }} # Default glance host name or IP (string value) -glance_host=$my_ip +glance_host={{ CONTROLLER_HOST_ADDRESS }} # Default glance port (integer value) #glance_port=9292 @@ -2363,7 +2363,7 @@ volume_group=cinder-volumes # Deprecated group/name - [DEFAULT]/sql_connection # Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [sql]/connection -connection=postgresql://{{ CINDER_DB_USER }}:{{ CINDER_DB_PASSWORD }}@{{ CONTROLLER_HOST }}/cinder +connection=postgresql://{{ CINDER_DB_USER }}:{{ CINDER_DB_PASSWORD }}@{{ CONTROLLER_HOST_ADDRESS }}/cinder # The SQLAlchemy connection string to use to connect to the # slave database. (string value) @@ -2531,67 +2531,10 @@ connection=postgresql://{{ CINDER_DB_USER }}:{{ CINDER_DB_PASSWORD }}@{{ CONTROL [keystone_authtoken] -# -# Options defined in keystonemiddleware.auth_token -# - -# Prefix to prepend at the beginning of the path. Deprecated, -# use identity_uri. (string value) -#auth_admin_prefix= - -# Host providing the admin Identity API endpoint. Deprecated, -# use identity_uri. (string value) -auth_host={{ OPENSTACK_AUTH_HOST }} - -# Port of the admin Identity API endpoint. Deprecated, use -# identity_uri. (integer value) -auth_port={{ OPENSTACK_AUTH_PORT }} - -# Protocol of the admin Identity API endpoint (http or https). -# Deprecated, use identity_uri. (string value) -auth_protocol=http - -# Complete public Identity API endpoint (string value) -auth_uri=$auth_protocol://$auth_host:$auth_port - -# Complete admin Identity API endpoint. This should specify -# the unversioned root endpoint e.g. https://localhost:35357/ -# (string value) -#identity_uri= - -# API version of the admin Identity API endpoint (string -# value) -auth_version=v2.0 - -# Do not handle authorization requests within the middleware, -# but delegate the authorization decision to downstream WSGI -# components (boolean value) -#delay_auth_decision=false - -# Request timeout value for communicating with Identity API -# server. (boolean value) -#http_connect_timeout= - -# How many times are we trying to reconnect when communicating -# with Identity API Server. (integer value) -#http_request_max_retries=3 - -# This option is deprecated and may be removed in a future -# release. Single shared secret with the Keystone -# configuration used for bootstrapping a Keystone -# installation, or otherwise bypassing the normal -# authentication process. This option should not be used, use -# `admin_user` and `admin_password` instead. (string value) -#admin_token= - -# Keystone account username (string value) +identity_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:35357 +auth_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0 admin_user={{ CINDER_USER }} - -# Keystone account password (string value) admin_password={{ CINDER_PASSWORD }} - -# Keystone service account tenant name to validate user tokens -# (string value) admin_tenant_name=service # Env key for the swift cache (string value) -- cgit v1.2.1