Code cleaning

Code cleaning

Code cleaning

Code cleaning

README.markdown

@@ -56,8 +56,8 @@ Also see the examples/profile.pp file for an example on how to set up dependenci
      
 ```
   class { 'razor':
-    db_hostname => '127.0.0.1',
-    db_password => 'notasecretpassword',
+    database_hostname => '127.0.0.1',
+    database_password => 'notasecretpassword',
     server_http_port => '8150',
   } 
 ```

lib/puppet/provider/razor_rest.rb

@@ -17,7 +17,7 @@ class Puppet::Provider::Rest < Puppet::Provider
   end
   
   def self.get_rest_info
-    config_file = "/etc/puppetlabs/razor-server/api.yaml
+    config_file = "/etc/puppetlabs/razor-server/api.yaml"
 
     data = File.read(config_file) or raise "Could not read setting file #{config_file}"    
     yamldata = YAML.load(data)

manifests/client.pp

@@ -9,18 +9,6 @@
 # Nicolas Truyens <nicolas@truyens.com>
 #
 class razor::client inherits razor {
-  # TODO: razor client should follow ruby version (based on puppet version)
-
-  # Follow Server version
-#  if ($::razor::client_package_version == undef) {
-    #if (versioncmp($::razor::server_package_version, '1.6.1') <= 0) {
-#      $real_client_package_version = '1.3.0'
-    #} else {
-    #  $real_client_package_version = $::razor::server_package_version
-    #}
-# } else {
-#   $real_client_package_version = $::razor::client_package_version
-#  }
 
   # Install the ruby gem
   ensure_packages([$::razor::client_package_name], {'provider' => 'puppet_gem'})

manifests/init.pp

@@ -17,7 +17,6 @@
 # * server_package_name (string): See Params
 # * server_package_version (string): Package version for Razor Server (Default: 'present')
 # * torquebox_package_name (string): See Params
-# * torquebox_package_version (string): Package version for Torquebox (Default: 'present')
 # * server_config_file (string): See Params
 # * server_service_name (string): See Params
 # * server_hostname (string): The hostname of the TFTP server. (Default: $::ipaddress)
@@ -25,7 +24,6 @@
 # * microkernel_url (string): See Params
 # * match_nodes_on (array): See Params
 # * enable_new_ports_support (boolean): Whether to use the new ports allocated from Razor 1.1.0  (Default: false)
-# * enable_aio_support (boolean): Whether to use AIO package paths from Razor 1.4.0  (Default: false)
 # * server_http_port (string): HTTP server port name/number - Deprecated, use enable_new_ports_support instead.
 # * server_https_port (string): HTTPS server port name/number - Deprecated, use enable_new_ports_support instead.
 # * config_dir (path): Path where configuration files are stored  - Deprecated, use enable_aio_support instead.
@@ -43,10 +41,10 @@
 # === Examples
 #  class{ 'razor':
 #    compile_microkernel   => false,
-#    db_hostname           => $::fqdn,
-#    db_database           => 'razor',
-#    db_user               => 'razor',
-#    db_password           => 'notsecret',
+#    database_hostname     => $::fqdn,
+#    database_database     => 'razor',
+#    database_user         => 'razor',
+#    database_password     => 'notsecret',
 #  }
 #
 # === Authors
@@ -75,7 +73,6 @@ class razor (
   String $server_package_name       = $razor::params::server_package_name,
   String $server_package_version    = 'present',
   String $torquebox_package_name    = $razor::params::torquebox_package_name,
-  String $torquebox_package_version = 'present',
   String $server_config_file        = $razor::params::server_config_file,
   String $server_service_name       = $razor::params::server_service_name,
 
@@ -91,13 +88,12 @@ class razor (
 
   # Version-specific defaults
   Boolean $enable_new_ports_support = false,
-  Boolean $enable_aio_support       = true,
 
   # Override defaults
   Variant[Undef, Integer] $server_http_port  = undef,
   Variant[Undef, Integer] $server_https_port = undef,
 
-  Variant[Undef, String] $config_dir           = '/etc/puppetlabs/razor-server',
+  Variant[Undef, String] $config_dir           = undef,
   Variant[Undef, String] $data_dir             = undef,
   Variant[Undef, String] $repo_store           = undef,
   Variant[Undef, String] $binary_dir           = undef,
@@ -126,21 +122,12 @@ class razor (
   }
 
   # Paths
-  if ($enable_aio_support) {
     $default_config_dir           = '/etc/puppetlabs/razor-server'
     $default_data_dir             = '/opt/puppetlabs/server/apps/razor-server/share/razor-server'
     $default_repo_store           = '/opt/puppetlabs/server/data/razor-server/repo'
     $default_binary_dir           = '/opt/puppetlabs/bin'
     $default_jruby_binary_dir     = '/opt/puppetlabs/server/apps/razor-server/bin'
     $default_torquebox_binary_dir = '/opt/puppetlabs/server/apps/razor-server/sbin'
-  } else {
-    $default_config_dir           = '/etc/razor'
-    $default_data_dir             = '/opt/razor'
-    $default_repo_store           = '/var/lib/razor/repo-store'
-    $default_binary_dir           = '/opt/razor/bin'
-    $default_jruby_binary_dir     = '/opt/razor-torquebox/jruby/bin'
-    $default_torquebox_binary_dir = '/opt/razor-torquebox/jruby/bin'
-  }
 
   if ($config_dir == undef) {
     $real_config_dir = $default_config_dir

manifests/params.pp

@@ -6,7 +6,6 @@
 #   * compile_microkernel (boolean): Whether to compile the microkernel (only supported on RedHat)
 #   * client_package_name (string): Package name for Razor Client
 #   * server_package_name (string): Package name for Razor Server
-#   * torquebox_package_name (string): Package name for Torquebox
 #   * server_config_file (string): Filename for configuration of Razor Server
 #   * server_service_name (string): Name of the service that manages Razor Server
 #   * microkernel_url (string): URL of where to download Microkernel (tarball). Set undef to skip.
@@ -25,7 +24,6 @@ class razor::params {
 
   $client_package_name    = 'razor-client'
   $server_package_name    = 'razor-server'
-  $torquebox_package_name = 'razor-torquebox'
 
   $server_config_file  = 'config.yaml'
   $server_service_name = 'razor-server'

manifests/server.pp

@@ -102,13 +102,6 @@ class razor::server inherits razor {
   }
 
   # Installation
-  if ($::razor::enable_aio_support == false) {
-    # Torquebox was auto-dependency < 1.0.0, but no longer by 1.3.0
-    # From 1.4.0 (AIO packaging), it is included in the server package.
-    package { $::razor::torquebox_package_name:
-      ensure => $::razor::torquebox_package_version,
-    } -> Package[$::razor::server_package_name]
-  }
 
   package { $::razor::server_package_name:
     ensure => $::razor::server_package_version,