summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColleen Murphy <colleen.murphy@suse.de>2018-04-26 17:39:40 +0200
committerColleen Murphy <colleen.murphy@suse.de>2018-04-27 17:22:49 +0200
commit7a3b3c6f81eb0f052e7ac90623969473434fefbc (patch)
tree0120ad2a0dc3f019dc224772bee8e219e8a02e58
parent31e44bbcb053b3d057c0ca72669b6f0e860f2039 (diff)
Fix defined type namespacing
Without this patch, puppet 4 apply tests can't find the mod defined type and fail with: Evaluation Error: Resource type not found: Mod at /etc/puppetlabs/code/modules/ethercalc/manifests/apache.pp:43:15 This patch ensures the resource reference is namespaced the same way the resource declaration is already. Change-Id: I891572c245f878a198f972e33e7ddbff74a5a731
Notes
Notes (review): Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Code-Review+2: Joshua Hesketh <josh@nitrotech.org> Workflow+1: Joshua Hesketh <josh@nitrotech.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 01 May 2018 22:48:10 +0000 Reviewed-on: https://review.openstack.org/564535 Project: openstack-infra/puppet-ethercalc Branch: refs/heads/master
-rw-r--r--manifests/apache.pp10
1 files changed, 5 insertions, 5 deletions
diff --git a/manifests/apache.pp b/manifests/apache.pp
index 4a7fa04..758d836 100644
--- a/manifests/apache.pp
+++ b/manifests/apache.pp
@@ -40,22 +40,22 @@ class ethercalc::apache (
40 ssl => true, 40 ssl => true,
41 } 41 }
42 42
43 if !defined(Mod['rewrite']) { 43 if !defined(Httpd::Mod['rewrite']) {
44 httpd::mod { 'rewrite': 44 httpd::mod { 'rewrite':
45 ensure => present, 45 ensure => present,
46 } 46 }
47 } 47 }
48 if !defined(Mod['proxy']) { 48 if !defined(Httpd::Mod['proxy']) {
49 httpd::mod { 'proxy': 49 httpd::mod { 'proxy':
50 ensure => present, 50 ensure => present,
51 } 51 }
52 } 52 }
53 if !defined(Mod['proxy_http']) { 53 if !defined(Httpd::Mod['proxy_http']) {
54 httpd::mod { 'proxy_http': 54 httpd::mod { 'proxy_http':
55 ensure => present, 55 ensure => present,
56 } 56 }
57 } 57 }
58 if !defined(Mod['proxy_wstunnel']) { 58 if !defined(Httpd::Mod['proxy_wstunnel']) {
59 httpd::mod { 'proxy_wstunnel': 59 httpd::mod { 'proxy_wstunnel':
60 ensure => present, 60 ensure => present,
61 } 61 }
@@ -66,7 +66,7 @@ class ethercalc::apache (
66 ensure => present, 66 ensure => present,
67 } 67 }
68 } 68 }
69 if !defined(Mod['auth_openid']) { 69 if !defined(Httpd::Mod['auth_openid']) {
70 httpd::mod { 'auth_openid': 70 httpd::mod { 'auth_openid':
71 ensure => present, 71 ensure => present,
72 require => Package['libapache2-mod-auth-openid'], 72 require => Package['libapache2-mod-auth-openid'],