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/init.pp.orig 2015-08-10 09:39:41.906630428 -0700 |
5 --- openstack-glance-6.1.0/manifests/init.pp.orig 2016-04-21 07:51:03.237198178 -0700 |
6 +++ openstack-glance-6.1.0/manifests/init.pp 2015-08-10 09:40:10.746985189 -0700 |
6 +++ openstack-glance-6.1.0/manifests/init.pp 2016-04-21 07:51:32.893728947 -0700 |
7 @@ -15,13 +15,6 @@ class glance( |
7 @@ -1,3 +1,7 @@ |
8 |
8 +####################################################################### |
|
9 +# Oracle has modified the originally distributed contents of this file. |
|
10 +####################################################################### |
|
11 + |
|
12 # == class: glance |
|
13 # |
|
14 # base glance config. |
|
15 @@ -15,13 +19,6 @@ |
|
16 |
9 include ::glance::params |
17 include ::glance::params |
10 |
18 |
11 - file { '/etc/glance/': |
19 - file { '/etc/glance/': |
12 - ensure => directory, |
20 - ensure => directory, |
13 - owner => 'glance', |
21 - owner => 'glance', |
14 - group => 'root', |
22 - group => 'root', |
15 - mode => '0770', |
23 - mode => '0770', |