diff --git a/.fixtures.yml b/.fixtures.yml index 48430390..2b75d42a 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -14,7 +14,6 @@ fixtures: common: "git://github.com/katello/puppet-common.git" qpid: "git://github.com/katello/puppet-qpid.git" candlepin: "git://github.com/katello/puppet-candlepin.git" - gutterball: "git://github.com/katello/puppet-gutterball.git" pulp: "git://github.com/katello/puppet-pulp.git" symlinks: katello: "#{source_dir}" diff --git a/manifests/plugin/gutterball.pp b/manifests/plugin/gutterball.pp deleted file mode 100644 index 707f84cd..00000000 --- a/manifests/plugin/gutterball.pp +++ /dev/null @@ -1,19 +0,0 @@ -# gutterball plugin -class katello::plugin::gutterball{ - - Class[ 'certs' ] -> - class { '::certs::gutterball': } -> - foreman::plugin { 'gutterball': } -> - class { '::gutterball': - amqp_broker_host => $::fqdn, - amqp_broker_port => $::qpid::ssl_port, - keystore_password => $certs::gutterball::gutterball_keystore_password, - truststore_password => $certs::gutterball::gutterball_keystore_password, - } ~> - class { '::katello::plugin::gutterball::config': - foreman_plugins_dir => $katello::config_dir, - foreman_user => $katello::user, - foreman_group => $katello::group, - notify => [Service['foreman-tasks'], Class['foreman::service']], - } -} diff --git a/manifests/plugin/gutterball/config.pp b/manifests/plugin/gutterball/config.pp deleted file mode 100644 index e02ed04c..00000000 --- a/manifests/plugin/gutterball/config.pp +++ /dev/null @@ -1,15 +0,0 @@ -# gutterball config -class katello::plugin::gutterball::config( - $foreman_user = 'foreman', - $foreman_group = 'foreman', - $foreman_plugins_dir = '/etc/foreman/plugins', - $url = "https://${::fqdn}:8443/gutterball", - ){ - - file { "${foreman_plugins_dir}/gutterball.yaml": - content => template('katello/plugin/gutterball/gutterball.yaml.erb'), - owner => $foreman_user, - group => $foreman_group, - mode => '0644', - } -} diff --git a/metadata.json b/metadata.json index c95b441d..dbf3a9f9 100644 --- a/metadata.json +++ b/metadata.json @@ -48,10 +48,6 @@ "name": "katello-candlepin", "version_requirement": ">= 1.0.0 < 2.0.0" }, - { - "name": "katello-gutterball", - "version_requirement": ">= 0.1.0 < 1.0.0" - }, { "name": "katello-pulp", "version_requirement": ">= 3.0.0 < 4.0.0" diff --git a/spec/classes/plugin_gutterball_spec.rb b/spec/classes/plugin_gutterball_spec.rb deleted file mode 100644 index f6be5175..00000000 --- a/spec/classes/plugin_gutterball_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -require 'spec_helper' - -describe 'katello::plugin::gutterball' do - let :pre_condition do - "class {['certs', 'foreman', 'katello']: }" - end - - let :facts do - { - :concat_basedir => '/tmp', - :operatingsystem => 'RedHat', - :operatingsystemrelease => '6.4', - :operatingsystemmajrelease => '6', - :osfamily => 'RedHat', - } - end - - it { should contain_class('certs::gutterball') } - - it 'should call the plugin' do - should contain_foreman__plugin('gutterball') - end - - it { should contain_class('gutterball') } -end diff --git a/templates/plugin/gutterball/gutterball.yaml.erb b/templates/plugin/gutterball/gutterball.yaml.erb deleted file mode 100644 index 1cee953b..00000000 --- a/templates/plugin/gutterball/gutterball.yaml.erb +++ /dev/null @@ -1,2 +0,0 @@ -foreman_gutterball: - url: <%= @url %>