equal
deleted
inserted
replaced
1 In-house patch to add support for Solaris 11.3 and 12.0. This patch |
1 In-house patch to add support for Solaris 11.3 and 12.0. This patch |
2 has not yet been submitted upstream due to requirements for 3rd party |
2 has not yet been submitted upstream due to requirements for 3rd party |
3 CI testing. |
3 CI testing. |
4 |
4 |
5 --- openstack-glance-6.1.0/manifests/registry.pp.orig 2015-08-10 09:42:54.166718964 -0700 |
5 --- openstack-glance-6.1.0/manifests/registry.pp.orig 2016-04-21 07:52:19.885897917 -0700 |
6 +++ openstack-glance-6.1.0/manifests/registry.pp 2015-08-10 09:43:04.061499589 -0700 |
6 +++ openstack-glance-6.1.0/manifests/registry.pp 2016-04-21 07:52:49.376252569 -0700 |
7 @@ -171,7 +171,6 @@ class glance::registry( |
7 @@ -1,3 +1,7 @@ |
|
8 +####################################################################### |
|
9 +# Oracle has modified the originally distributed contents of this file. |
|
10 +####################################################################### |
|
11 + |
|
12 # == Class: glance::registry |
|
13 # |
|
14 # Installs and configures glance-registry |
|
15 @@ -171,7 +175,6 @@ |
8 ) |
16 ) |
9 } |
17 } |
10 |
18 |
11 - Package[$glance::params::registry_package_name] -> File['/etc/glance/'] |
19 - Package[$glance::params::registry_package_name] -> File['/etc/glance/'] |
12 Package[$glance::params::registry_package_name] -> Glance_registry_config<||> |
20 Package[$glance::params::registry_package_name] -> Glance_registry_config<||> |
13 |
21 |
14 Glance_registry_config<||> ~> Exec<| title == 'glance-manage db_sync' |> |
22 Glance_registry_config<||> ~> Exec<| title == 'glance-manage db_sync' |> |
15 @@ -179,9 +178,6 @@ class glance::registry( |
23 @@ -179,9 +182,6 @@ |
16 |
24 |
17 File { |
25 File { |
18 ensure => present, |
26 ensure => present, |
19 - owner => 'glance', |
27 - owner => 'glance', |
20 - group => 'glance', |
28 - group => 'glance', |
21 - mode => '0640', |
29 - mode => '0640', |