More work needed on spec tests (voxpupuli#57).

cegeka · Jul 24, 2015 · 9ccc8a5 · 9ccc8a5
1 parent b098658
commit 9ccc8a5
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 89 deletions.
diff --git a/manifests/opscenter.pp b/manifests/opscenter.pp
@@ -26,12 +26,25 @@
     require => Class['cassandra'],
     before  => Service['opscenterd']
   }
-
-  cassandra::opscenter::setting { 'authentication enabled':
+
+  service { 'opscenterd':
+    ensure => $service_ensure,
+    name   => $service_name,
+    enable => $service_enable,
+  }
+
+  cassandra::opscenter::setting { 'webserver interface':
+    path    => $config_file,
+    section => 'webserver',
+    setting => 'interface',
+    value   => $webserver_interface
+  }
+
+  cassandra::opscenter::setting { 'webserver log_path':
     path    => $config_file,
-    section => 'authentication',
-    setting => 'enabled',
-    value   => $authentication_enabled,
+    section => 'webserver',
+    setting => 'log_path',
+    value   => $webserver_log_path
   }
 
   cassandra::opscenter::setting { 'webserver port':
@@ -41,11 +54,11 @@
     value   => $webserver_port
   }
 
-  cassandra::opscenter::setting { 'webserver interface':
+  cassandra::opscenter::setting { 'webserver ssl_certfile':
     path    => $config_file,
     section => 'webserver',
-    setting => 'interface',
-    value   => $webserver_interface
+    setting => 'ssl_certfile',
+    value   => $webserver_ssl_certfile
   }
 
   cassandra::opscenter::setting { 'webserver ssl_keyfile':
@@ -55,23 +68,31 @@
     value   => $webserver_ssl_keyfile
   }
 
-  cassandra::opscenter::setting { 'webserver ssl_certfile':
+  cassandra::opscenter::setting { 'webserver ssl_port':
     path    => $config_file,
     section => 'webserver',
-    setting => 'ssl_certfile',
-    value   => $webserver_ssl_certfile
+    setting => 'ssl_port',
+    value   => $webserver_ssl_port
   }
 
-  cassandra::opscenter::setting { 'webserver ssl_port':
+  cassandra::opscenter::setting { 'webserver staticdir':
     path    => $config_file,
     section => 'webserver',
-    setting => 'ssl_port',
-    value   => $webserver_ssl_port
+    setting => 'staticdir',
+    value   => $webserver_staticdir
   }
 
-  service { 'opscenterd':
-    ensure => $service_ensure,
-    name   => $service_name,
-    enable => $service_enable,
+  cassandra::opscenter::setting { 'webserver sub_process_timeout':
+    path    => $config_file,
+    section => 'webserver',
+    setting => 'sub_process_timeout',
+    value   => $webserver_sub_process_timeout
+  }
+
+  cassandra::opscenter::setting { 'webserver tarball_process_timeout':
+    path    => $config_file,
+    section => 'webserver',
+    setting => 'tarball_process_timeout',
+    value   => $webserver_tarball_process_timeout
   }
 }
diff --git a/manifests/opscenter/setting.pp b/manifests/opscenter/setting.pp
@@ -6,7 +6,7 @@
   $value,
   ) {
   if value != undef {
-    ini_setting { "${section}:${setting}":
+    ini_setting { "${section} ${setting}":
       ensure            => present,
       path              => $path,
       section           => $section,

diff --git a/spec/classes/opscenter_spec.rb b/spec/classes/opscenter_spec.rb
@@ -11,7 +11,7 @@
 
   context 'Test for cassandra::opscenter with defaults.' do
     it {
-      should contain_class('cassandra::opscenter').only_with({
+      should contain_class('cassandra::opscenter').with({
         'authentication_enabled'            => 'False',
         'ensure'                            => 'present',
         'config_file'                       => '/etc/opscenter/opscenterd.conf',
@@ -32,75 +32,6 @@
     }
   end
 
-  context 'Test authentication enabled.' do
-    it {
-      should contain_cassandra__opscenter__setting('authentication enabled').only_with({
-        'name'         => 'authentication enabled',
-        'path'         => '/etc/opscenter/opscenterd.conf',
-        'section'      => 'authentication',
-        'setting'      => 'enabled',
-        'value'        => 'False'
-      })
-    }
-  end
-
-  context 'webserver port.' do
-    it {
-      should contain_cassandra__opscenter__setting('webserver port').only_with({
-        'name'         => 'webserver port',
-        'path'         => '/etc/opscenter/opscenterd.conf',
-        'section'      => 'webserver',
-        'setting'      => 'port',
-        'value'        => 8888
-      })
-    }
-  end
-
-  context 'webserver interface.' do
-    it {
-      should contain_cassandra__opscenter__setting('webserver interface').only_with({
-        'name'         => 'webserver interface',
-        'path'         => '/etc/opscenter/opscenterd.conf',
-        'section'      => 'webserver',
-        'setting'      => 'interface',
-        'value'        => '0.0.0.0'
-      })
-    }
-  end
-
-  context 'webserver ssl_keyfile.' do
-    it { should contain_cassandra__opscenter__setting(
-           'webserver ssl_keyfile').only_with({
-        'name'         => 'webserver ssl_keyfile',
-        'path'         => '/etc/opscenter/opscenterd.conf',
-        'section'      => 'webserver',
-        'setting'      => 'ssl_keyfile'
-      })
-    }
-  end
-
-  context 'webserver ssl_port.' do
-    it { should contain_cassandra__opscenter__setting(
-           'webserver ssl_port').only_with({
-        'name'         => 'webserver ssl_port',
-        'path'         => '/etc/opscenter/opscenterd.conf',
-        'section'      => 'webserver',
-        'setting'      => 'ssl_port'
-      })
-    }
-  end
-
-  context 'webserver ssl_certfile.' do
-    it { should contain_cassandra__opscenter__setting(
-           'webserver ssl_certfile').only_with({
-        'name'         => 'webserver ssl_certfile',
-        'path'         => '/etc/opscenter/opscenterd.conf',
-        'section'      => 'webserver',
-        'setting'      => 'ssl_certfile'
-      })
-    }
-  end
-
   context 'Test for cassandra::opscenter service.' do
     it {
       should contain_service('opscenterd')