diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-26 19:16:56 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-04-02 11:13:33 +0000 |
commit | c3c5c5f1bbf1a5bffc8391240a8a3a9e82838c52 (patch) | |
tree | 07baa3bf6917156f375d752fc41f2d85c29c0a29 | |
parent | 32facbcbd052940f812883acf642f05c2d869398 (diff) | |
download | definitions-c3c5c5f1bbf1a5bffc8391240a8a3a9e82838c52.tar.gz |
cinder: Move templates to /usr/share/openstack/cinder
Also change placeholders to jinja2 type
-rw-r--r-- | openstack/usr/share/openstack/cinder/api-paste.ini (renamed from openstack/etc/cinder/api-paste.ini) | 0 | ||||
-rw-r--r-- | openstack/usr/share/openstack/cinder/cinder.conf (renamed from openstack/etc/cinder/cinder.conf) | 79 | ||||
-rw-r--r-- | openstack/usr/share/openstack/cinder/policy.json (renamed from openstack/etc/cinder/policy.json) | 0 |
3 files changed, 11 insertions, 68 deletions
diff --git a/openstack/etc/cinder/api-paste.ini b/openstack/usr/share/openstack/cinder/api-paste.ini index 31619fc8..31619fc8 100644 --- a/openstack/etc/cinder/api-paste.ini +++ b/openstack/usr/share/openstack/cinder/api-paste.ini diff --git a/openstack/etc/cinder/cinder.conf b/openstack/usr/share/openstack/cinder/cinder.conf index 764c08bc..924140f7 100644 --- a/openstack/etc/cinder/cinder.conf +++ b/openstack/usr/share/openstack/cinder/cinder.conf @@ -77,11 +77,11 @@ state_path = /var/lib/cinder # The RabbitMQ broker address where a single node is used. # (string value) -rabbit_host=##RABBITMQ_HOST## +rabbit_host={{ RABBITMQ_HOST }} # The RabbitMQ broker port where a single node is used. # (integer value) -rabbit_port=##RABBITMQ_PORT## +rabbit_port={{ RABBITMQ_PORT }} # RabbitMQ HA cluster host:port pairs. (list value) #rabbit_hosts=$rabbit_host:$rabbit_port @@ -90,10 +90,10 @@ rabbit_port=##RABBITMQ_PORT## #rabbit_use_ssl=false # The RabbitMQ userid. (string value) -rabbit_userid=##RABBITMQ_USER## +rabbit_userid={{ RABBITMQ_USER }} # The RabbitMQ password. (string value) -rabbit_password=##RABBITMQ_PASSWORD## +rabbit_password={{ RABBITMQ_PASSWORD }} # the RabbitMQ login method (string value) #rabbit_login_method=AMQPLAIN @@ -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##@onenode/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##@onenode/cinder [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=<None> - -# 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=<None> - -# 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=<None> - -# Keystone account username (string value) -admin_user=##CINDER_USER## - -# Keystone account password (string value) -admin_password=##CINDER_PASSWORD## - -# Keystone service account tenant name to validate user tokens -# (string value) +identity_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:35357 +auth_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0 +admin_user={{ CINDER_USER }} +admin_password={{ CINDER_PASSWORD }} admin_tenant_name=service # Env key for the swift cache (string value) diff --git a/openstack/etc/cinder/policy.json b/openstack/usr/share/openstack/cinder/policy.json index 96f0a73b..96f0a73b 100644 --- a/openstack/etc/cinder/policy.json +++ b/openstack/usr/share/openstack/cinder/policy.json |