Merge lp:~gandelman-a/glance/service_config_patch into lp:~ubuntu-server-dev/glance/essex

[Adam Gandelman]

Adds placeholders to example registry + api server paste.inis so juju charms can easily update.

[Martin Pitt (pitti)]

This doesn't seem applied in current wily, is this still relevant? If so, please set back to "needs review", otherwise close/delete this please.

review: Needs Information

Unmerged revisions

120. By Adam Gandelman on 2012-03-02

debian/patches/service_account_placeholder.patch: Add examples
to highlight new keystone service auth interface.

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-01 14:08:50 +0000
+++ debian/changelog	2012-03-02 03:36:22 +0000
@@ -3,6 +3,8 @@
   * New upstream release.
   * debian/control: Add python date-util. (LP: #943748)
   * debian/control: Add ca-certificates. (LP: #932800)
+  * debian/patches/service_account_placeholder.patch: Add examples
+    to highlight new keystone service auth interface.
 
  -- Chuck Short <[e-mail]>  Thu, 01 Mar 2012 09:08:46 -0500
 
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-02-11 02:31:21 +0000
+++ debian/patches/series	2012-03-02 03:36:22 +0000
@@ -1,1 +1,2 @@
 sql_conn.patch
+service_account_placeholder.patch
 
=== added file 'debian/patches/service_account_placeholder.patch'
--- debian/patches/service_account_placeholder.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/service_account_placeholder.patch	2012-03-02 03:36:22 +0000
@@ -0,0 +1,37 @@
+Description: Add some example place holders for easing scripted upgrades,
+and also for the sake of highlighting the interface change until upstream
+documents it.
+Author: Adam Gandelman <[e-mail]>
+
+Index: glance-2012.1/etc/glance-api-paste.ini
+===================================================================
+--- glance-2012.1.orig/etc/glance-api-paste.ini	2012-03-01 18:58:57.000000000 -0800
++++ glance-2012.1/etc/glance-api-paste.ini	2012-03-01 19:02:52.601690512 -0800
+@@ -72,6 +72,11 @@
+ auth_protocol = http
+ auth_uri = http://127.0.0.1:5000/
+ admin_token = 999888777666
++# Keystone now authenticates services by service username, password and tenant
++# Update the following with appropriate credentials
++admin_tenant_name = tenant
++admin_user = service_user
++admin_password = service_password
+ 
+ [filter:auth-context]
+ paste.filter_factory = glance.common.wsgi:filter_factory
+Index: glance-2012.1/etc/glance-registry-paste.ini
+===================================================================
+--- glance-2012.1.orig/etc/glance-registry-paste.ini	2012-03-01 19:04:00.657687519 -0800
++++ glance-2012.1/etc/glance-registry-paste.ini	2012-03-01 19:04:35.785685974 -0800
+@@ -29,6 +29,11 @@
+ auth_protocol = http
+ auth_uri = http://127.0.0.1:5000/
+ admin_token = 999888777666
++# Keystone now authenticates services by service username, password and tenant
++# Update the following with appropriate credentials
++admin_tenant_name = tenant
++admin_user = service_user
++admin_password = service_password
+ 
+ [filter:auth-context]
+ context_class = glance.registry.context.RequestContext