openstack/deb-trove
Code Issues Proposed changes

Adds add-keystone_authtoken-in-trove.conf.patch and enable config.

Browse Source
This commit is contained in:
Thomas Goirand
2016-03-31 11:12:11 +02:00
parent 8066d7119c
commit 38c04457e0
5 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@@ -10,6 +10,7 @@ openstack-trove (1:5.0.0~rc1-3) UNRELEASED; urgency=medium
* Write db and rabbit info in all needed config files.
* Add make-trove-taskmanager.conf-parseable.patch.
* Add install-missing-files.patch.
* Add add-keystone_authtoken-in-trove.conf.patch.
-- Thomas Goirand <zigo@debian.org> Wed, 30 Mar 2016 10:25:54 +0200

22
debian/patches/add-keystone_authtoken-in-trove.conf.patch vendored Normal file
View File

@@ -0,0 +1,22 @@
Description: Add a keystone_authtoken section in trove.conf
Author: Thomas Goirand <zigo@debian.org>
Forwarded: no
Last-Update: 2016-03-31
--- openstack-trove-5.0.0~rc1.orig/etc/trove/trove.conf.sample
+++ openstack-trove-5.0.0~rc1/etc/trove/trove.conf.sample
@@ -310,4 +310,12 @@ api_strategy = trove.common.strategies.c
# Indicate which header field names may be used during the actual request.
# (list value)
-#allow_headers = X-Auth-Token, X-Identity-Status, X-Roles, X-Service-Catalog, X-User-Id, X-Tenant-Id, X-OpenStack-Request-ID
\ No newline at end of file
+#allow_headers = X-Auth-Token, X-Identity-Status, X-Roles, X-Service-Catalog, X-User-Id, X-Tenant-Id, X-OpenStack-Request-ID
+
+
+[keystone_authtoken]
+auth_host = 192.168.10.3
+auth_protocol = http
+admin_user = admin
+admin_password = XXXXXX
+admin_tenant_name = admin

1
debian/patches/series vendored
View File

@@ -3,3 +3,4 @@ Fix-apischema-for-boolean_string.patch
fix-import-error.patch
make-trove-taskmanager.conf-parseable.patch
install-missing-files.patch
add-keystone_authtoken-in-trove.conf.patch

2
debian/trove-common.config.in vendored
View File

@@ -11,6 +11,6 @@ CONF=/etc/trove/trove.conf
pkgos_var_user_group trove
pkgos_dbc_read_conf -pkg trove-common ${CONF} database connection trove $@
pkgos_rabbit_read_conf ${CONF} oslo_messaging_rabbit trove
#pkgos_read_admin_creds /etc/trove/api-paste.ini filter:authtoken trove
pkgos_read_admin_creds ${CONF} keystone_authtoken trove
exit 0

2
debian/trove-common.postinst.in vendored
View File

@@ -30,7 +30,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
pkgos_inifile set /etc/trove/trove-taskmanager.conf database connection ${RET}
trove-manage db_sync
fi
#pkgos_write_admin_creds /etc/trove/api-paste.ini filter:authtoken trove
pkgos_write_admin_creds /etc/trove/trove.conf keystone_authtoken trove
pkgos_rabbit_write_conf /etc/trove/trove.conf oslo_messaging_rabbit trove
pkgos_rabbit_write_conf /etc/trove/trove-conductor.conf oslo_messaging_rabbit trove