author | Drew Fisher <drew.fisher@oracle.com> |
Fri, 16 Sep 2016 07:20:38 -0700 | |
changeset 6917 | 6936cd289acf |
parent 6817 | e4a26f447d0c |
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 |
|
5860
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
5 |
--- openstack-swift-6.1.0/manifests/proxy.pp.orig 2016-04-21 08:34:39.790662969 -0700 |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
6 |
+++ openstack-swift-6.1.0/manifests/proxy.pp 2016-04-21 08:34:51.601941595 -0700 |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
7 |
@@ -1,3 +1,7 @@ |
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 |
+ |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
12 |
# |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
13 |
# TODO - assumes that proxy server is always a memcached server |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
14 |
# |
6817
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
15 |
@@ -173,16 +177,19 @@ class swift::proxy( |
5464
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
16 |
fail ('log_udp_port requires log_udp_host to be set') |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
17 |
} |
6817
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
18 |
|
5464
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
19 |
- package { 'swift-proxy': |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
20 |
- ensure => $package_ensure, |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
21 |
- name => $::swift::params::proxy_package_name, |
6817
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
22 |
- tag => ['openstack', 'swift-package'], |
5464
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
23 |
+ if ( $swift::params::proxy_package_name != $swift::params::package_name ) { |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
24 |
+ ensure_packages([$swift::params::proxy_package_name], |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
25 |
+ { |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
26 |
+ ensure => $package_ensure, |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
27 |
+ name => $::swift::params::proxy_package_name, |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
28 |
+ tag => 'openstack', |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
29 |
+ } |
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 |
} |
6817
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
32 |
|
5464
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
33 |
concat { '/etc/swift/proxy-server.conf': |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
34 |
owner => 'swift', |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
35 |
group => 'swift', |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
36 |
- require => Package['swift-proxy'], |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
37 |
} |
6817
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
38 |
|
5464
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
39 |
$required_classes = split( |