Merge pull request #12 from Mylezeem/include_apache

install: Use include ::apache rather than calling the class
redhat-openstack · Jul 7, 2014 · 64fb5f8 · 64fb5f8
2 parents acd8aca + 3f30288
commit 64fb5f8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -7,10 +7,7 @@
   }
 
   if $::kibana3::manage_ws {
-    class {
-      'apache':
-      default_vhost => false,
-    }
+    include ::apache
   }
 
   if $::kibana3::k3_folder_owner {

diff --git a/spec/classes/install_spec.rb b/spec/classes/install_spec.rb
@@ -14,8 +14,7 @@
       context 'with defaults' do
         it { should compile }
         it { should contain_class('git') }
-        it { should contain_class('apache') \
-          .with_default_vhost(false) }
+        it { should contain_class('apache') }
         it { should contain_vcsrepo('/opt/kibana3') \
           .with_revision('a50a913') \
           .that_notifies('Class[Apache::Service]') \
@@ -31,8 +30,7 @@
         let (:params) {{ :manage_git => false }}
         it { should compile }
         it { should_not contain_class('git') }
-        it { should contain_class('apache') \
-          .with_default_vhost(false) }
+        it { should contain_class('apache') }
         it { should contain_vcsrepo('/opt/kibana3') \
           .with_revision('a50a913') \
           .that_notifies('Class[Apache::Service]') \
@@ -61,8 +59,7 @@
         let (:params) {{ :k3_folder_owner => 'foo' }}
         it { should compile }
         it { should contain_class('git') }
-        it { should contain_class('apache')\
-          .with_default_vhost(false) }
+        it { should contain_class('apache') }
         it { should contain_vcsrepo('/opt/kibana3') \
           .with(
             'revision' => 'a50a913',
@@ -82,8 +79,7 @@
         let (:params) {{ :k3_install_folder => '/tmp/kibana3' }}
         it { should compile }
         it { should contain_class('git') }
-        it { should contain_class('apache')\
-          .with_default_vhost(false) }
+        it { should contain_class('apache') }
         it { should contain_vcsrepo('/tmp/kibana3') \
           .with_revision('a50a913') \
           .that_notifies('Class[Apache::Service]') \
@@ -99,8 +95,7 @@
         let (:params) {{ :k3_release => '3a485aa' }}
         it { should compile }
         it { should contain_class('git') }
-        it { should contain_class('apache')\
-          .with_default_vhost(false) }
+        it { should contain_class('apache') }
         it { should contain_vcsrepo('/opt/kibana3') \
           .with_revision('3a485aa') \
           .that_notifies('Class[Apache::Service]') \
@@ -116,8 +111,7 @@
         let (:params) {{ :ws_port => '8080' }}
         it { should compile }
         it { should contain_class('git') }
-        it { should contain_class('apache')\
-          .with_default_vhost(false) }
+        it { should contain_class('apache') }
         it { should contain_vcsrepo('/opt/kibana3') \
           .with_revision('a50a913') \
           .that_notifies('Class[Apache::Service]') \