FIXUPME: Enable minimal configuration for Cinder in one host

4 files changed, 29 insertions, 25 deletions

diff --git a/openstack-glance.configure b/openstack-glance.configure
index 7a84c5e3..c99d4fd0 100644
--- a/openstack-glance.configure
+++ b/openstack-glance.configure
@@ -37,6 +37,7 @@ sed -f "$ROOT"/etc/openstack-glance-setup.sed -i \
        "$ROOT"/etc/glance/glance-registry.conf \
        "$ROOT"/etc/glance/glance-scrubber.conf \
        "$ROOT"/etc/glance/glance-cache.conf \
+       "$ROOT"/etc/cinder/cinder.conf \
        "$ROOT"/usr/share/openstack/openstack-glance-setup 
 
 ##########################################################################
diff --git a/openstack-keystone.configure b/openstack-keystone.configure
index 2c59e45e..ae3bb0b6 100644
--- a/openstack-keystone.configure
+++ b/openstack-keystone.configure
@@ -37,6 +37,7 @@ sed -f "$ROOT"/etc/openstack-keystone-setup.sed -i \
        "$ROOT"/etc/keystone/keystone.conf \
        "$ROOT"/etc/glance/glance-api.conf \
        "$ROOT"/etc/glance/glance-registry.conf \
+       "$ROOT"/etc/cinder/cinder.conf \
        "$ROOT"/usr/share/openstack/openstack-keystone-setup
 
 ##########################################################################
diff --git a/openstack-rabbitmq.configure b/openstack-rabbitmq.configure
index 5a2e9fc4..db9460d7 100644
--- a/openstack-rabbitmq.configure
+++ b/openstack-rabbitmq.configure
@@ -33,6 +33,7 @@ EOF
 sed -f "$ROOT"/etc/openstack-rabbitmq-setup.sed -i \
        "$ROOT"/etc/keystone/keystone.conf \
        "$ROOT"/etc/nova/nova.conf \
+       "$ROOT"/etc/cinder/cinder.conf \
        "$ROOT"/usr/share/openstack/openstack-rabbitmq-setup
 
 ##########################################################################
diff --git a/openstack/etc/cinder/cinder.conf b/openstack/etc/cinder/cinder.conf
index f76c96b8..c67c80c6 100644
--- a/openstack/etc/cinder/cinder.conf
+++ b/openstack/etc/cinder/cinder.conf
@@ -1,5 +1,6 @@
 [DEFAULT]
- 
+
+state_path = /var/lib/cinder 
 #
 # Options defined in oslo.messaging
 #
@@ -76,11 +77,11 @@
  
 # The RabbitMQ broker address where a single node is used.
 # (string value)
-#rabbit_host=localhost
+rabbit_host=##RABBITMQ_HOST##
  
 # The RabbitMQ broker port where a single node is used.
 # (integer value)
-#rabbit_port=5672
+rabbit_port=##RABBITMQ_PORT##
  
 # RabbitMQ HA cluster host:port pairs. (list value)
 #rabbit_hosts=$rabbit_host:$rabbit_port
@@ -89,10 +90,10 @@
 #rabbit_use_ssl=false
  
 # The RabbitMQ userid. (string value)
-#rabbit_userid=guest
+rabbit_userid=##RABBITMQ_USER##
  
 # The RabbitMQ password. (string value)
-#rabbit_password=guest
+rabbit_password=##RABBITMQ_PASSWORD##
  
 # the RabbitMQ login method (string value)
 #rabbit_login_method=AMQPLAIN
@@ -177,7 +178,7 @@
  
 # The messaging driver to use, defaults to rabbit. Other
 # drivers include qpid and zmq. (string value)
-#rpc_backend=rabbit
+rpc_backend=rabbit
  
 # The default exchange under which topics are scoped. May be
 # overridden by an exchange name specified in the
@@ -486,7 +487,7 @@
  
 # File name for the paste.deploy config for cinder-api (string
 # value)
-#api_paste_config=api-paste.ini
+api_paste_config=api-paste.ini
  
 # Top-level directory for maintaining cinder's state (string
 # value)
@@ -494,10 +495,10 @@
 #state_path=/var/lib/cinder
  
 # IP address of this host (string value)
-#my_ip=10.0.0.1
+my_ip=##GLANCE_HOST##
  
 # Default glance host name or IP (string value)
-#glance_host=$my_ip
+glance_host=$my_ip
  
 # Default glance port (integer value)
 #glance_port=9292
@@ -591,7 +592,7 @@
  
 # Path to the rootwrap configuration file to use for running
 # commands as root (string value)
-#rootwrap_config=/etc/cinder/rootwrap.conf
+rootwrap_config=/etc/cinder/rootwrap.conf
  
 # Enable monkey patching (boolean value)
 #monkey_patch=false
@@ -613,7 +614,7 @@
  
 # The strategy to use for auth. Supports noauth, keystone, and
 # deprecated. (string value)
-#auth_strategy=noauth
+auth_strategy=keystone
  
 # A list of backend names to use. These backend names should
 # be backed by a unique [CONFIG] group with its options (list
@@ -693,7 +694,7 @@
  
 # Template string to be used to generate volume names (string
 # value)
-#volume_name_template=volume-%s
+volume_name_template=volume-%s
  
 # Template string to be used to generate snapshot names
 # (string value)
@@ -758,7 +759,7 @@
  
 # Directory to use for lock files. Default to a temp directory
 # (string value)
-#lock_path=<None>
+lock_path=/var/lock/cinder
  
  
 #
@@ -771,7 +772,7 @@
  
 # Print more verbose output (set logging level to INFO instead
 # of default WARNING level). (boolean value)
-#verbose=false
+verbose=True
  
 # Log output to standard error. (boolean value)
 #use_stderr=true
@@ -1061,10 +1062,10 @@
 # iSCSI target user-land tool to use. tgtadm is default, use
 # lioadm for LIO iSCSI support, iseradm for the ISER protocol,
 # or fake for testing. (string value)
-#iscsi_helper=tgtadm
+iscsi_helper=tgtadm
  
 # Volume configuration file storage directory (string value)
-#volumes_dir=$state_path/volumes
+volumes_dir=$state_path/volumes
  
 # IET configuration file (string value)
 #iet_conf=/etc/iet/ietd.conf
@@ -1559,7 +1560,7 @@
  
 # Name for the VG that will contain exported volumes (string
 # value)
-#volume_group=cinder-volumes
+volume_group=cinder-volumes
  
 # If >0, create LVs with multiple mirrors. Note that this
 # requires lvm_mirrors + 2 PVs with available space (integer
@@ -2362,7 +2363,7 @@
 # Deprecated group/name - [DEFAULT]/sql_connection
 # Deprecated group/name - [DATABASE]/sql_connection
 # Deprecated group/name - [sql]/connection
-#connection=<None>
+connection=sqlite:////var/lib/cinder/cinder.sqlite
  
 # The SQLAlchemy connection string to use to connect to the
 # slave database. (string value)
@@ -2540,18 +2541,18 @@
  
 # Host providing the admin Identity API endpoint. Deprecated,
 # use identity_uri. (string value)
-#auth_host=127.0.0.1
+auth_host=##OPENSTACK_AUTH_HOST##
  
 # Port of the admin Identity API endpoint. Deprecated, use
 # identity_uri. (integer value)
-#auth_port=35357
+auth_port=##OPENSTACK_AUTH_PORT##
  
 # Protocol of the admin Identity API endpoint (http or https).
 # Deprecated, use identity_uri. (string value)
-#auth_protocol=https
+auth_protocol=http
  
 # Complete public Identity API endpoint (string value)
-#auth_uri=<None>
+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/
@@ -2584,14 +2585,14 @@
 #admin_token=<None>
  
 # Keystone account username (string value)
-#admin_user=<None>
+admin_user=##CINDER_USER##
  
 # Keystone account password (string value)
-#admin_password=<None>
+admin_password=##CINDER_PASSWORD##
  
 # Keystone service account tenant name to validate user tokens
 # (string value)
-#admin_tenant_name=admin
+admin_tenant_name=service
  
 # Env key for the swift cache (string value)
 #cache=<None>