author | Laszlo Peter <laszlo.peter@oracle.com> |
Wed, 07 Sep 2016 14:48:35 -0700 | |
changeset 6817 | e4a26f447d0c |
parent 5860 | afd31ba91ee9 |
permissions | -rw-r--r-- |
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 |
|
6817
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
5 |
--- openstack-glance-8.0.1/manifests/params.pp.orig 2016-05-06 08:03:31.669873231 -0700 |
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
6 |
+++ openstack-glance-8.0.1/manifests/params.pp 2016-05-06 08:06:03.214534543 -0700 |
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
7 |
@@ -1,14 +1,16 @@ |
5860
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 { |
6817
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
15 |
|
5464
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' |
6817
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
27 |
$glare_package_name = 'openstack-glance' |
5464
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
28 |
$registry_package_name = 'openstack-glance' |
6817
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
29 |
@@ -24,6 +26,9 @@ class glance::params { |
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
30 |
$pymysql_package_name = undef |
5464
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' |
6817
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
37 |
$glare_package_name = 'glance-glare' |
5464
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
38 |
$registry_package_name = 'glance-registry' |
6817
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
39 |
@@ -34,6 +39,20 @@ class glance::params { |
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
40 |
$sqlite_package_name = 'python-pysqlite2' |
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
41 |
$pymysql_package_name = 'python-pymysql' |
5464
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 |
+ $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
|
46 |
+ $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
|
47 |
+ $api_package_name = 'cloud/openstack/glance' |
6817
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
48 |
+ $glare_package_name = undef |
5464
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' |
6817
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
51 |
+ $glare_service_name = undef |
5464
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
52 |
+ $registry_service_name = 'application/openstack/glance/glance-registry' |
6817
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
53 |
+ $pyceph_package_name = undef |
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
54 |
+ $sqlite_package_name = undef |
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
55 |
+ $pymysql_package_name = undef |
5464
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
56 |
+ } |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
57 |
default: { |
6817
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
58 |
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian") |
5464
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
59 |
} |