| 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/init.pp.orig 2016-04-21 09:04:49.670248833 -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/init.pp 2016-04-21 09:05:19.849256812 -0700 |
|
6817
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
7 |
@@ -1,3 +1,7 @@ |
|
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 |
+ |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
12 |
# Install and configure base swift components |
|
5464
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
13 |
# |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
14 |
# == Parameters |
|
6917
6936cd289acf
24674278 swift puppet module still defines a File dependency with no file entries
Drew Fisher <drew.fisher@oracle.com>
parents:
6817
diff
changeset
|
15 |
@@ -85,29 +89,6 @@ class swift( |
|
5464
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
16 |
ensure => $client_package_ensure; |
|
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 |
- File { owner => 'swift', group => 'swift', require => Package['swift'] }
|
|
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 |
- file { '/etc/swift':
|
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
22 |
- ensure => directory, |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
23 |
- } |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
24 |
- user {'swift':
|
|
6817
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
25 |
- ensure => present, |
|
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
26 |
- require => Package['swift'], |
|
5464
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
27 |
- } |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
28 |
- file { '/var/lib/swift':
|
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
29 |
- ensure => directory, |
|
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 |
- file { '/var/run/swift':
|
|
6817
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
32 |
- ensure => directory, |
|
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
33 |
- selinux_ignore_defaults => true, |
|
5464
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
34 |
- } |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
35 |
- |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
36 |
- file { '/etc/swift/swift.conf':
|
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
37 |
- ensure => file, |
|
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 |
- |
|
6917
6936cd289acf
24674278 swift puppet module still defines a File dependency with no file entries
Drew Fisher <drew.fisher@oracle.com>
parents:
6817
diff
changeset
|
40 |
- File['/etc/swift/swift.conf'] -> Swift_config<||> |
|
6936cd289acf
24674278 swift puppet module still defines a File dependency with no file entries
Drew Fisher <drew.fisher@oracle.com>
parents:
6817
diff
changeset
|
41 |
- |
|
6817
e4a26f447d0c
24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5860
diff
changeset
|
42 |
swift_config {
|
|
6917
6936cd289acf
24674278 swift puppet module still defines a File dependency with no file entries
Drew Fisher <drew.fisher@oracle.com>
parents:
6817
diff
changeset
|
43 |
'swift-hash/swift_hash_path_suffix': value => $swift_hash_path_suffix_real; |
|
6936cd289acf
24674278 swift puppet module still defines a File dependency with no file entries
Drew Fisher <drew.fisher@oracle.com>
parents:
6817
diff
changeset
|
44 |
'swift-hash/swift_hash_path_prefix': value => $swift_hash_path_prefix; |