Added automatic Debconf configuration of RabbitMQ

diff --git a/debian/cinder-common.config.in b/debian/cinder-common.config.in
index 7c8c3f9678fe994a8c3fa7a092febcc511c319ab..23b24951feb2a609dd90273d7618d6defba292a0 100644 (file)
--- a/debian/cinder-common.config.in
+++ b/debian/cinder-common.config.in
@@ -26,6 +26,7 @@ CINDER_ENABLE=${CINDER_ENABLE}" >${CINDER_COM_DEF}
 
 pkgos_var_user_group cinder
 pkgos_dbc_read_conf -pkg cinder-common ${CINDER_CONF} DEFAULT sql_connection cinder $@
+pkgos_rabbit_read_conf ${CINDER_CONF} DEFAULT cinder
 pkgos_read_admin_creds ${CINDER_API} filter:authtoken cinder
 manage_cinder_enable
 

diff --git a/debian/cinder-common.install b/debian/cinder-common.install
index aed6cd48921edbc6a550c314cc4b7c662fe59938..f95c625077c65c986a1662cc0132dd233b6f2168 100644 (file)
--- a/debian/cinder-common.install
+++ b/debian/cinder-common.install
@@ -1,5 +1,3 @@
-debian/cinder.conf                     /usr/share/cinder-common
-debian/logging.conf                    /etc/cinder
 etc/cinder/api-paste.ini               /usr/share/cinder-common
 etc/cinder/policy.json                 /etc/cinder
 etc/cinder/rootwrap.conf               /etc/cinder

diff --git a/debian/cinder-common.postinst.in b/debian/cinder-common.postinst.in
index 61ae7e12dd14975bb1c7c52cd4843514027ba3bc..d7e3b90467273c9fc8d651976fdaefa4ef638930 100644 (file)
--- a/debian/cinder-common.postinst.in
+++ b/debian/cinder-common.postinst.in
@@ -21,7 +21,9 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
 
        pkgos_write_new_conf cinder cinder.conf
        pkgos_write_new_conf cinder api-paste.ini
+       pkgos_write_new_conf cinder logging.conf
        pkgos_dbc_postinst ${CINDER_CONF} DEFAULT sql_connection cinder $@
+       pkgos_rabbit_write_conf ${CINDER_CONF} DEFAULT cinder
        pkgos_write_admin_creds ${CINDER_API} filter:authtoken cinder
        db_get cinder/volume_group
        if [ -n "${RET}" ] ; then

diff --git a/debian/cinder-common.templates b/debian/cinder-common.templates
index 1508e552e3d99b9352b36685692937c546beb14e..902381a5e605aa548add4c288425dd85ae17e76a 100644 (file)
--- a/debian/cinder-common.templates
+++ b/debian/cinder-common.templates
@@ -50,3 +50,29 @@ Type: string
 _Description: Cinder volume group:
  Please specify the name of the LVM volume group (vg) on which Cinder
  will create partitions.
+
+Template: cinder/rabbit_host
+Type: string
+Default: localhost
+_Description: IP address of your RabbitMQ host:
+ In order to interoperate with other components of OpenStack, this package
+ needs to connect to a central RabbitMQ server.
+ .
+ Please specify the IP address of that server.
+
+Template: cinder/rabbit_userid
+Type: string
+Default: guest
+_Description: Username for connection to the RabbitMQ server:
+ In order to interoperate with other components of OpenStack, this package
+ needs to connect to a central RabbitMQ server.
+ .
+ Please specify the username used to connect to the RabbitMQ server.
+
+Template: cinder/rabbit_password
+Type: password
+_Description: Password for connection to the RabbitMQ server:
+ In order to interoperate with other components of OpenStack, this package
+ needs to connect to a central RabbitMQ server.
+ .
+ Please specify the password used to connect to the RabbitMQ server.

diff --git a/debian/rules b/debian/rules
index 212b3b6927bee4e469806a63c4fe4430d3f50c33..ea4530192f0b1838c3cdb17d96439feb10bfbbf3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,8 @@ override_dh_clean:
 override_dh_install:
        dh_install --fail-missing -Xbin/cinder-all
        install -D -m 0440 debian/cinder-common.sudoers $(CURDIR)/debian/cinder-common/etc/sudoers.d/cinder-common
+       install -D -m 0644 $(CURDIR)/etc/cinder/cinder.conf.sample $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
+       install -D -m 0644 $(CURDIR)/etc/cinder/logging_sample.conf $(CURDIR)/debian/cinder-common/usr/share/cinder-common/logging.conf
 
 override_dh_fixperms:
        dh_fixperms -Xcinder_tgt.conf