From 20d3307d4c9d25eb7b0b77daa5295c1c2560a0f5 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 1 May 2014 00:03:15 +0800 Subject: [PATCH] * Now using keystone_authtoken in cinder.conf instead of api-paste.ini: - Fixed config and postinst scripts of cinder-common to use that. - Removed patch for api-paste.ini. --- debian/changelog | 8 ++++ debian/cinder-common.config.in | 3 +- debian/cinder-common.postinst.in | 3 +- debian/patches/re-add-filter-authtoken.patch | 39 -------------------- debian/patches/series | 1 - 5 files changed, 10 insertions(+), 44 deletions(-) delete mode 100644 debian/patches/re-add-filter-authtoken.patch diff --git a/debian/changelog b/debian/changelog index 62de46ab0..ec56fba93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +cinder (2014.1-3) unstable; urgency=medium + + * Now using keystone_authtoken in cinder.conf instead of api-paste.ini: + - Fixed config and postinst scripts of cinder-common to use that. + - Removed patch for api-paste.ini. + + -- Thomas Goirand Thu, 01 May 2014 00:01:50 +0800 + cinder (2014.1-2) unstable; urgency=medium * Applied patch from Mike Perez to be able to create diff --git a/debian/cinder-common.config.in b/debian/cinder-common.config.in index 80a9a3fa6..ec9fc6bcc 100644 --- a/debian/cinder-common.config.in +++ b/debian/cinder-common.config.in @@ -4,14 +4,13 @@ set -e . /usr/share/debconf/confmodule CINDER_CONF=/etc/cinder/cinder.conf -CINDER_API=/etc/cinder/api-paste.ini #PKGOS-INCLUDE# 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 +pkgos_read_admin_creds ${CINDER_CONF} keystone_authtoken cinder pkgos_inifile get ${CINDER_CONF} DEFAULT volume_group if [ -n "${RET}" ] && [ ! "${RET}" = "NOT_FOUND" ] ; then diff --git a/debian/cinder-common.postinst.in b/debian/cinder-common.postinst.in index d7e3b9046..d949ac9d1 100644 --- a/debian/cinder-common.postinst.in +++ b/debian/cinder-common.postinst.in @@ -3,7 +3,6 @@ set -e CINDER_CONF=/etc/cinder/cinder.conf -CINDER_API=/etc/cinder/api-paste.ini #PKGOS-INCLUDE# @@ -24,7 +23,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then 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 + pkgos_write_admin_creds ${CINDER_CONF} keystone_authtoken cinder db_get cinder/volume_group if [ -n "${RET}" ] ; then pkgos_inifile set ${CINDER_CONF} DEFAULT volume_group ${RET} diff --git a/debian/patches/re-add-filter-authtoken.patch b/debian/patches/re-add-filter-authtoken.patch deleted file mode 100644 index 7d7bc9277..000000000 --- a/debian/patches/re-add-filter-authtoken.patch +++ /dev/null @@ -1,39 +0,0 @@ -Description: - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - cinder (2014.1~rc1-1) experimental; urgency=low - . - * New upstream release. - * Removed now useless fix-sqlalchemy-version patch. - * Fixed new (build-)dependencies for this release. -Author: Thomas Goirand - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- cinder-2014.1~rc1.orig/etc/cinder/api-paste.ini -+++ cinder-2014.1~rc1/etc/cinder/api-paste.ini -@@ -53,3 +53,9 @@ paste.filter_factory = cinder.api.middle - - [filter:authtoken] - paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory -+auth_host = 127.0.0.1 -+auth_port = 35357 -+auth_protocol = http -+admin_tenant_name = %SERVICE_TENANT_NAME% -+admin_user = %SERVICE_USER% -+admin_password = %SERVICE_PASSWORD% diff --git a/debian/patches/series b/debian/patches/series index 69f34a7a4..5d66926da 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ install-missing-files.patch -re-add-filter-authtoken.patch fallback-to-None-on-missing-Glance-image-attrs.patch -- 2.45.2