components/openstack/glance/patches/09-glance-conf.patch
author Laszlo Peter <laszlo.peter@oracle.com>
Wed, 07 Sep 2016 14:48:42 -0700
changeset 6852 bf55de364b19
parent 6176 8b75bcaa9d4d
permissions -rw-r--r--
24465632 Update Glance for the Mitaka release
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6176
8b75bcaa9d4d 22929852 Some OpenStack configuration files need some section adjustments
david.comay@oracle.com
parents:
diff changeset
     1
In-house patch to further adjust Glance's oslo-config-generator files
8b75bcaa9d4d 22929852 Some OpenStack configuration files need some section adjustments
david.comay@oracle.com
parents:
diff changeset
     2
to account for which modules are actually imported for each service.
8b75bcaa9d4d 22929852 Some OpenStack configuration files need some section adjustments
david.comay@oracle.com
parents:
diff changeset
     3
These changes are meant as a follow-on to Launchpad bug 1500361 but
8b75bcaa9d4d 22929852 Some OpenStack configuration files need some section adjustments
david.comay@oracle.com
parents:
diff changeset
     4
they have not yet been submitted upstream.
8b75bcaa9d4d 22929852 Some OpenStack configuration files need some section adjustments
david.comay@oracle.com
parents:
diff changeset
     5
6852
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
     6
--- glance-12.0.0/etc/oslo-config-generator/glance-api.conf.~1~	2016-04-07 00:37:11.000000000 -0700
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
     7
+++ glance-12.0.0/etc/oslo-config-generator/glance-api.conf	2016-07-30 00:39:05.833802230 -0700
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
     8
@@ -9,4 +9,4 @@ namespace = oslo.db.concurrency
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
     9
 namespace = oslo.policy
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
    10
 namespace = keystonemiddleware.auth_token
6176
8b75bcaa9d4d 22929852 Some OpenStack configuration files need some section adjustments
david.comay@oracle.com
parents:
diff changeset
    11
 namespace = oslo.log
6852
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
    12
-namespace = oslo.middleware.cors
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
    13
+namespace = oslo.middleware
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
    14
--- glance-12.0.0/etc/oslo-config-generator/glance-cache.conf.~1~	2016-04-07 00:37:11.000000000 -0700
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
    15
+++ glance-12.0.0/etc/oslo-config-generator/glance-cache.conf	2016-07-30 00:39:33.080265565 -0700
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
    16
@@ -3,3 +3,5 @@ output_file = etc/glance-cache.conf.samp
6176
8b75bcaa9d4d 22929852 Some OpenStack configuration files need some section adjustments
david.comay@oracle.com
parents:
diff changeset
    17
 namespace = glance.cache
8b75bcaa9d4d 22929852 Some OpenStack configuration files need some section adjustments
david.comay@oracle.com
parents:
diff changeset
    18
 namespace = oslo.log
8b75bcaa9d4d 22929852 Some OpenStack configuration files need some section adjustments
david.comay@oracle.com
parents:
diff changeset
    19
 namespace = oslo.policy
8b75bcaa9d4d 22929852 Some OpenStack configuration files need some section adjustments
david.comay@oracle.com
parents:
diff changeset
    20
+namespace = glance.store
8b75bcaa9d4d 22929852 Some OpenStack configuration files need some section adjustments
david.comay@oracle.com
parents:
diff changeset
    21
+namespace = oslo.concurrency
6852
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
    22
--- glance-12.0.0/etc/oslo-config-generator/glance-glare.conf.~1~	2016-04-07 00:37:11.000000000 -0700
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
    23
+++ glance-12.0.0/etc/oslo-config-generator/glance-glare.conf	2016-07-30 00:39:05.834807800 -0700
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
    24
@@ -6,4 +6,7 @@ namespace = oslo.db
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
    25
 namespace = oslo.db.concurrency
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
    26
 namespace = keystonemiddleware.auth_token
6176
8b75bcaa9d4d 22929852 Some OpenStack configuration files need some section adjustments
david.comay@oracle.com
parents:
diff changeset
    27
 namespace = oslo.log
6852
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
    28
-namespace = oslo.middleware.cors
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
    29
+namespace = oslo.middleware
6176
8b75bcaa9d4d 22929852 Some OpenStack configuration files need some section adjustments
david.comay@oracle.com
parents:
diff changeset
    30
+namespace = oslo.concurrency
8b75bcaa9d4d 22929852 Some OpenStack configuration files need some section adjustments
david.comay@oracle.com
parents:
diff changeset
    31
+namespace = oslo.messaging
8b75bcaa9d4d 22929852 Some OpenStack configuration files need some section adjustments
david.comay@oracle.com
parents:
diff changeset
    32
+namespace = oslo.policy
6852
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
    33
--- glance-12.0.0/etc/oslo-config-generator/glance-registry.conf.~1~	2016-04-07 00:37:11.000000000 -0700
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
    34
+++ glance-12.0.0/etc/oslo-config-generator/glance-registry.conf	2016-07-30 00:39:05.835268420 -0700
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
    35
@@ -8,3 +8,5 @@ namespace = oslo.db.concurrency
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
    36
 namespace = oslo.policy
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
    37
 namespace = keystonemiddleware.auth_token
6176
8b75bcaa9d4d 22929852 Some OpenStack configuration files need some section adjustments
david.comay@oracle.com
parents:
diff changeset
    38
 namespace = oslo.log
6852
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
    39
+namespace = oslo.concurrency
bf55de364b19 24465632 Update Glance for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6176
diff changeset
    40
+namespace = oslo.middleware