Merge "Update script for debian package creation."

4 files changed, 126 insertions, 0 deletions

diff --git a/keystone-moon/debian/patches/fixes-default-connection.patch b/keystone-moon/debian/patches/fixes-default-connection.patch
new file mode 100644
index 00000000..5a9e03d8
--- /dev/null
+++ b/keystone-moon/debian/patches/fixes-default-connection.patch
@@ -0,0 +1,19 @@
+Description: Fixes default db config
+ Sets SQLite by default, so that db_sync can work in a non-interactive mode.
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: no
+Last-Update: 2014-03-28
+
+Index: keystone/etc/keystone.conf.sample
+===================================================================
+--- keystone.orig/etc/keystone.conf.sample
++++ keystone/etc/keystone.conf.sample
+@@ -546,7 +546,7 @@
+ # Deprecated group/name - [DEFAULT]/sql_connection
+ # Deprecated group/name - [DATABASE]/sql_connection
+ # Deprecated group/name - [sql]/connection
+-#connection = <None>
++connection=sqlite:////var/lib/keystone/keystone.sqlite
+ 
+ # The SQLAlchemy connection string to use to connect to the slave database.
+ # (string value)
diff --git a/keystone-moon/debian/patches/fixes-jsonschema-requirements.txt.patch b/keystone-moon/debian/patches/fixes-jsonschema-requirements.txt.patch
new file mode 100644
index 00000000..b2bf9b21
--- /dev/null
+++ b/keystone-moon/debian/patches/fixes-jsonschema-requirements.txt.patch
@@ -0,0 +1,18 @@
+Description: Fixes requirements.txt
+ Without this patch, keystone wouldn't start.
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: not-needed
+Last-Update: 2015-09-23
+
+Index: keystone/requirements.txt
+===================================================================
+--- keystone.orig/requirements.txt
++++ keystone/requirements.txt
+@@ -34,6 +34,6 @@ oslo.utils>=3.5.0 # Apache-2.0
+ oauthlib>=0.6 # BSD
+ pysaml2<4.0.3,>=2.4.0 # Apache-2.0
+ dogpile.cache>=0.5.7 # BSD
+-jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
++jsonschema
+ pycadf!=2.0.0,>=1.1.0 # Apache-2.0
+ msgpack-python>=0.4.0 # Apache-2.0
diff --git a/keystone-moon/debian/patches/fixes-keystone-default-catalog.patch b/keystone-moon/debian/patches/fixes-keystone-default-catalog.patch
new file mode 100644
index 00000000..10740ecc
--- /dev/null
+++ b/keystone-moon/debian/patches/fixes-keystone-default-catalog.patch
@@ -0,0 +1,86 @@
+Description: Fix default keystone catalog
+ Fix default catalog so that it matches the region name which is set by
+ default by debconf in all of the Openstack Debian packages.
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: no
+Last-Update: 2016-03-03
+
+diff --git a/etc/default_catalog.templates b/etc/default_catalog.templates
+index e885b52..936be8b 100644
+--- a/etc/default_catalog.templates
++++ b/etc/default_catalog.templates
+@@ -1,42 +1,42 @@
+ # config for templated.Catalog, using camelCase because I don't want to do
+ # translations for keystone compat
+-catalog.RegionOne.identity.publicURL = http://localhost:$(public_port)s/v2.0
+-catalog.RegionOne.identity.adminURL = http://localhost:$(admin_port)s/v2.0
+-catalog.RegionOne.identity.internalURL = http://localhost:$(public_port)s/v2.0
+-catalog.RegionOne.identity.name = Identity Service
++catalog.regionOne.identity.publicURL = http://localhost:$(public_port)s/v2.0
++catalog.regionOne.identity.adminURL = http://localhost:$(admin_port)s/v2.0
++catalog.regionOne.identity.internalURL = http://localhost:$(public_port)s/v2.0
++catalog.regionOne.identity.name = Identity Service
+ 
+ # fake compute service for now to help novaclient tests work
+-catalog.RegionOne.computev21.publicURL = http://localhost:8774/v2.1/$(tenant_id)s
+-catalog.RegionOne.computev21.adminURL = http://localhost:8774/v2.1/$(tenant_id)s
+-catalog.RegionOne.computev21.internalURL = http://localhost:8774/v2.1/$(tenant_id)s
+-catalog.RegionOne.computev21.name = Compute Service V2.1
++catalog.regionOne.computev21.publicURL = http://localhost:8774/v2.1/$(tenant_id)s
++catalog.regionOne.computev21.adminURL = http://localhost:8774/v2.1/$(tenant_id)s
++catalog.regionOne.computev21.internalURL = http://localhost:8774/v2.1/$(tenant_id)s
++catalog.regionOne.computev21.name = Compute Service V2.1
+ 
+-catalog.RegionOne.volumev2.publicURL = http://localhost:8776/v2/$(tenant_id)s
+-catalog.RegionOne.volumev2.adminURL = http://localhost:8776/v2/$(tenant_id)s
+-catalog.RegionOne.volumev2.internalURL = http://localhost:8776/v2/$(tenant_id)s
+-catalog.RegionOne.volumev2.name = Volume Service V2
++catalog.regionOne.volumev2.publicURL = http://localhost:8776/v2/$(tenant_id)s
++catalog.regionOne.volumev2.adminURL = http://localhost:8776/v2/$(tenant_id)s
++catalog.regionOne.volumev2.internalURL = http://localhost:8776/v2/$(tenant_id)s
++catalog.regionOne.volumev2.name = Volume Service V2
+ 
+-catalog.RegionOne.ec2.publicURL = http://localhost:8773/services/Cloud
+-catalog.RegionOne.ec2.adminURL = http://localhost:8773/services/Admin
+-catalog.RegionOne.ec2.internalURL = http://localhost:8773/services/Cloud
+-catalog.RegionOne.ec2.name = EC2 Service
++catalog.regionOne.ec2.publicURL = http://localhost:8773/services/Cloud
++catalog.regionOne.ec2.adminURL = http://localhost:8773/services/Admin
++catalog.regionOne.ec2.internalURL = http://localhost:8773/services/Cloud
++catalog.regionOne.ec2.name = EC2 Service
+ 
+-catalog.RegionOne.image.publicURL = http://localhost:9292
+-catalog.RegionOne.image.adminURL = http://localhost:9292
+-catalog.RegionOne.image.internalURL = http://localhost:9292
+-catalog.RegionOne.image.name = Image Service
++catalog.regionOne.image.publicURL = http://localhost:9292
++catalog.regionOne.image.adminURL = http://localhost:9292
++catalog.regionOne.image.internalURL = http://localhost:9292
++catalog.regionOne.image.name = Image Service
+ 
+-catalog.RegionOne.network.publicURL = http://localhost:9696
+-catalog.RegionOne.network.adminURL = http://localhost:9696
+-catalog.RegionOne.network.internalURL = http://localhost:9696
+-catalog.RegionOne.network.name = Network Service
++catalog.regionOne.network.publicURL = http://localhost:9696
++catalog.regionOne.network.adminURL = http://localhost:9696
++catalog.regionOne.network.internalURL = http://localhost:9696
++catalog.regionOne.network.name = Network Service
+ 
+-catalog.RegionOne.orchestration.publicURL = http://localhost:8004/v1/$(tenant_id)s
+-catalog.RegionOne.orchestration.adminURL = http://localhost:8004/v1/$(tenant_id)s
+-catalog.RegionOne.orchestration.internalURL = http://localhost:8004/v1/$(tenant_id)s
+-catalog.RegionOne.orchestration.name = Orchestration Service
++catalog.regionOne.orchestration.publicURL = http://localhost:8004/v1/$(tenant_id)s
++catalog.regionOne.orchestration.adminURL = http://localhost:8004/v1/$(tenant_id)s
++catalog.regionOne.orchestration.internalURL = http://localhost:8004/v1/$(tenant_id)s
++catalog.regionOne.orchestration.name = Orchestration Service
+ 
+-catalog.RegionOne.metering.publicURL = http://localhost:8777
+-catalog.RegionOne.metering.adminURL = http://localhost:8777
+-catalog.RegionOne.metering.internalURL = http://localhost:8777
+-catalog.RegionOne.metering.name = Telemetry Service
++catalog.regionOne.metering.publicURL = http://localhost:8777
++catalog.regionOne.metering.adminURL = http://localhost:8777
++catalog.regionOne.metering.internalURL = http://localhost:8777
++catalog.regionOne.metering.name = Telemetry Service
diff --git a/keystone-moon/debian/patches/series b/keystone-moon/debian/patches/series
new file mode 100644
index 00000000..f5deed3f
--- /dev/null
+++ b/keystone-moon/debian/patches/series
@@ -0,0 +1,3 @@
+fixes-keystone-default-catalog.patch
+fixes-default-connection.patch
+fixes-jsonschema-requirements.txt.patch