components/ruby/puppet-modules/openstack-glance/patches/02-params.patch
author Patrick Einheber <patrick.einheber@oracle.com>
Wed, 27 Apr 2016 14:55:10 -0700
changeset 5860 afd31ba91ee9
parent 5464 6e2e17e6aa45
child 6817 e4a26f447d0c
permissions -rw-r--r--
23146903 Puppet and OpenStack modules need modification notices
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5464
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     1
In-house patch to add support for Solaris 11.3 and 12.0.  This patch
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     2
has not yet been submitted upstream due to requirements for 3rd party
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     3
CI testing.
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     4
5860
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
     5
--- openstack-glance-6.1.0/manifests/params.pp.orig	2016-04-21 07:49:15.937218438 -0700
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
     6
+++ openstack-glance-6.1.0/manifests/params.pp	2016-04-21 07:49:38.722449269 -0700
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
     7
@@ -1,14 +1,15 @@
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
     8
+#######################################################################
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
     9
+# Oracle has modified the originally distributed contents of this file.
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    10
+#######################################################################
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    11
+
5464
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    12
 # these parameters need to be accessed from several locations and
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    13
 # should be considered to be constant
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    14
 class glance::params {
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    15
-
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    16
-  $client_package_name = 'python-glanceclient'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    17
-
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    18
-  $cache_cleaner_command = 'glance-cache-cleaner'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    19
-  $cache_pruner_command  = 'glance-cache-pruner'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    20
-
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    21
   case $::osfamily {
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    22
     'RedHat': {
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    23
+      $client_package_name   = 'python-glanceclient'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    24
+      $cache_cleaner_command = 'glance-cache-cleaner'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    25
+      $cache_pruner_command  = 'glance-cache-pruner'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    26
       $api_package_name      = 'openstack-glance'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    27
       $registry_package_name = 'openstack-glance'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    28
       $api_service_name      = 'openstack-glance-api'
5860
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    29
@@ -21,6 +22,9 @@
5464
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    30
       }
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    31
     }
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    32
     'Debian': {
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    33
+      $client_package_name   = 'python-glanceclient'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    34
+      $cache_cleaner_command = 'glance-cache-cleaner'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    35
+      $cache_pruner_command  = 'glance-cache-pruner'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    36
       $api_package_name      = 'glance-api'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    37
       $registry_package_name = 'glance-registry'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    38
       $api_service_name      = 'glance-api'
5860
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    39
@@ -28,8 +32,19 @@
5464
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    40
       $db_sync_command       = 'glance-manage --config-file=/etc/glance/glance-registry.conf db_sync'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    41
       $pyceph_package_name   = 'python-ceph'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    42
     }
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    43
+    'Solaris': {
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    44
+      $client_package_name   = 'library/python/glanceclient'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    45
+      $pyceph_package_name   = undef
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    46
+      $cache_cleaner_command = '/usr/lib/glance/glance-cache-cleaner'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    47
+      $cache_pruner_command  = '/usr/lib/glance/glance-cache-pruner'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    48
+      $api_package_name      = 'cloud/openstack/glance'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    49
+      $registry_package_name = 'cloud/openstack/glance'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    50
+      $api_service_name      = 'application/openstack/glance/glance-api'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    51
+      $registry_service_name = 'application/openstack/glance/glance-registry'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    52
+      $db_sync_command       = undef
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    53
+    }
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    54
     default: {
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    55
-      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    56
+      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily Solaris, RedHat, and Debian")
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    57
     }
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    58
   }
5860
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    59