Fixes #8585: Remove unused configuration and unneeded functions.

theforeman · Feb 16, 2015 · de2606c · de2606c
1 parent fa0be36
commit de2606c
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 80 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -17,13 +17,6 @@
     before  => [Class['foreman::database'], Exec['foreman-rake-db:migrate']],
   }
 
-  file { '/etc/sysconfig/katello':
-    content => template('katello/etc/sysconfig/katello.erb'),
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-  }
-
   foreman::config::passenger::fragment{ 'katello':
     content     => template('katello/etc/httpd/conf.d/05-foreman.d/katello.conf.erb'),
     ssl_content => template('katello/etc/httpd/conf.d/05-foreman-ssl.d/katello.conf.erb'),
@@ -36,12 +29,4 @@
     mode   => '0755',
   }
 
-  file { "${katello::config_dir}/katello/client.conf":
-    ensure  => file,
-    content => template('katello/client.conf.erb'),
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-  }
-
 }
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -113,8 +113,6 @@
 
   class { 'certs::foreman': }
 
-  class { 'katello::service': }
-
   Service['httpd'] -> Exec['foreman-rake-db:seed']
 
   User<|title == apache|>{groups +> $user_groups}

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -47,9 +47,6 @@
   $config_dir  = '/etc/foreman/plugins'
   $log_dir     = '/var/log/foreman/plugins'
 
-  # sysconfig settings
-  $job_workers = 1
-
   # OAUTH settings
   $oauth_key = 'katello'
 
@@ -64,19 +61,11 @@
 
   # Subsystems settings
   $candlepin_url = 'https://localhost:8443/candlepin'
-  $pulp_url      = subsystem_url('pulp/api/v2/')
-  $foreman_url   = subsystem_url('foreman')
+  $pulp_url      = "https://${::fqdn}/pulp/api/v2"
 
   # database reinitialization flag
   $reset_data = 'NONE'
 
-  # Delete this from configuration check
-  $use_foreman = false
-  $ldap_roles = false
-  $validate_ldap = false
-
-  $use_passenger = true
-
   $qpid_url = "amqp:ssl:${::fqdn}:5671"
   $candlepin_event_queue = 'katello_event_queue'
 }
diff --git a/manifests/service.pp b/manifests/service.pp
diff --git a/spec/classes/katello_spec.rb b/spec/classes/katello_spec.rb
@@ -57,7 +57,6 @@
 
     it { should contain_class('katello::install') }
     it { should contain_class('katello::config') }
-    it { should contain_class('katello::service') }
   end
 
   context 'on oel' do
@@ -77,7 +76,6 @@
 
     it { should contain_class('katello::install') }
     it { should contain_class('katello::config') }
-    it { should contain_class('katello::service') }
   end
 
   context 'on fedora' do

diff --git a/templates/katello.yml.erb b/templates/katello.yml.erb
@@ -12,43 +12,24 @@
 # see /usr/share/katello/config.katello_defaults.yml for available options
 
 common:
-  app_mode: 'katello'
   <%- if @cdn_ssl_version && !@cdn_ssl_version.strip.empty?-%>
   cdn_ssl_version: <%= @cdn_ssl_version %>
   <%- end -%>
 
-  warden:  <%= scope.lookupvar("katello::params::auth_method") %>
-  ldap_roles: <%= scope.lookupvar("katello::params::ldap_roles") %>
-  validate_ldap: <%= scope.lookupvar("katello::params::validate_ldap") %>
   rest_client_timeout: 120
 
-  url_prefix: <%= @deployment_url %>
-  host: <%= has_variable?("fqdn") ? @fqdn : hostname %>
-  port:
-  use_ssl: true
-  use_foreman: <%= scope.lookupvar("katello::params::use_foreman") %>
-
-  post_sync_url: https://localhost<%= scope.lookupvar("katello::params::deployment_url") %>/api/v2/repositories/sync_complete?token=<%= scope.lookupvar("post_sync_token") %>
+  post_sync_url: https://localhost<%= @deployment_url %>/api/v2/repositories/sync_complete?token=<%= @post_sync_token %>
 
   candlepin:
-    url: <%= scope.lookupvar("katello::params::candlepin_url") %>
+    url: <%= @candlepin_url %>
     oauth_key: <%= @oauth_key %>
     oauth_secret: <%= @oauth_secret %>
 
   pulp:
-    url: <%= scope.lookupvar("katello::params::pulp_url") %>
+    url: <%= @pulp_url %>
     oauth_key: <%= @oauth_key %>
     oauth_secret: <%= @oauth_secret %>
 
-  foreman:
-    url: <%= scope.lookupvar("katello::params::foreman_url") %>
-    oauth_key: <%= scope.lookupvar("katello::params::foreman_oauth_key") %>
-    oauth_secret: <%= scope.lookupvar("katello::params::oauth_secret") %>
-
-  cloud_forms:
-    oauth_key: <%= scope.lookupvar("katello::params::oauth_key") %>
-    oauth_secret: <%= scope.lookupvar("katello::params::oauth_secret") %>
-
   qpid:
     url: <%= @qpid_url %>
     subscriptions_queue_address: <%= @candlepin_event_queue %>
@@ -60,26 +41,3 @@ common:
     user: <%= @proxy_username %>
     password: <%= @proxy_password %>
 <%- end -%>
-
-  ldap_fluff_config:
-    host: <%= scope.lookupvar("katello::params::ldap_server") %>
-    port: <%= scope.lookupvar("katello::params::ldap_port") %>
-    encryption: <%= scope.lookupvar("katello::params::ldap_encryption") %>
-    base_dn: <%= scope.lookupvar("katello::params::ldap_users_basedn") %>
-    group_base: <%= scope.lookupvar("katello::params::ldap_groups_basedn") %>
-    server_type: <%= scope.lookupvar("katello::params::ldap_server_type") %>
-    service_user: <%= scope.lookupvar("katello::params::ldap_service_user") %>
-    service_pass: <%= scope.lookupvar("katello::params::ldap_service_pass") %>
-    anon_queries: <%= scope.lookupvar("katello::params::ldap_anon_queries") %>
-    ad_domain: <%= scope.lookupvar("katello::params::ldap_ad_domain") %>
-
-  # authentication
-  sso:
-    <%- if scope.lookupvar("katello::params::deployment") == 'katello' -%>
-    enable: true
-    <%- end -%>
-    <%- if scope.lookupvar("katello::params::deployment") == 'headpin' -%>
-    enable: false
-    <%- end -%>
-    provider_url: https://<%= scope.lookupvar('fqdn') -%>/signo
-    logout_path: /logout