From 20750e09b628f44ec8c8a36038c612007644d9b5 Mon Sep 17 00:00:00 2001 From: martyewings Date: Mon, 11 Jan 2021 16:37:11 +0000 Subject: [PATCH 1/8] add uninstaller --- manifests/remove_exporter.pp | 36 ++++++++++++++++++++++++++++ spec/classes/remove_exporter_spec.rb | 13 ++++++++++ 2 files changed, 49 insertions(+) create mode 100644 manifests/remove_exporter.pp create mode 100644 spec/classes/remove_exporter_spec.rb diff --git a/manifests/remove_exporter.pp b/manifests/remove_exporter.pp new file mode 100644 index 0000000..f517ce5 --- /dev/null +++ b/manifests/remove_exporter.pp @@ -0,0 +1,36 @@ +# @summary A short summary of the purpose of this class +# +# A description of what this class does +# +# @example +# include rsan::remove_exporter +class rsan::remove_exporter { + + +#Disable NFS Server + + class { '::nfs': + server_enabled => false + } + + $dbs = ['pe-activity', 'pe-classifier', 'pe-inventory', 'pe-puppetdb', 'pe-rbac', 'pe-orchestrator'] + $dbs.each |$db|{ + + + $dropowned_cmd = 'DROP OWNED BY rsan' + pe_postgresql_psql { "${dropowned_cmd} on ${db}": + command => $dropowned_cmd, + db => $db, + port => $pe_postgresql::server::port, + psql_user => $pe_postgresql::server::user, + psql_group => $pe_postgresql::server::group, + psql_path => $pe_postgresql::server::psql_path, + require => [Class['pe_postgresql::server']] + } + + } + + + + +} diff --git a/spec/classes/remove_exporter_spec.rb b/spec/classes/remove_exporter_spec.rb new file mode 100644 index 0000000..bb1450c --- /dev/null +++ b/spec/classes/remove_exporter_spec.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe 'rsan::remove_exporter' do + on_supported_os.each do |os, os_facts| + context "on #{os}" do + let(:facts) { os_facts } + + it { is_expected.to compile } + end + end +end From 45a013dd317ec0973d7be1b6affa11be14dc9731 Mon Sep 17 00:00:00 2001 From: MartyEwings Date: Mon, 11 Jan 2021 16:45:21 +0000 Subject: [PATCH 2/8] Update remove_exporter.pp --- manifests/remove_exporter.pp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/manifests/remove_exporter.pp b/manifests/remove_exporter.pp index f517ce5..5f53994 100644 --- a/manifests/remove_exporter.pp +++ b/manifests/remove_exporter.pp @@ -12,12 +12,11 @@ class { '::nfs': server_enabled => false } - - $dbs = ['pe-activity', 'pe-classifier', 'pe-inventory', 'pe-puppetdb', 'pe-rbac', 'pe-orchestrator'] + + $dbs = ['pe-activity', 'pe-classifier', 'pe-inventory', 'pe-puppetdb', 'pe-rbac', 'pe-orchestrator'] $dbs.each |$db|{ - - $dropowned_cmd = 'DROP OWNED BY rsan' + $dropowned_cmd = 'DROP OWNED BY rsan' pe_postgresql_psql { "${dropowned_cmd} on ${db}": command => $dropowned_cmd, db => $db, From 5b45520fd1493f77e2ae0d6947378ad430342d02 Mon Sep 17 00:00:00 2001 From: martyewings Date: Mon, 11 Jan 2021 16:52:47 +0000 Subject: [PATCH 3/8] add uninstaller --- manifests/remove_exporter.pp | 12 +++++++++++- spec/classes/importer_spec.rb | 5 +++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/manifests/remove_exporter.pp b/manifests/remove_exporter.pp index 5f53994..6b60f8c 100644 --- a/manifests/remove_exporter.pp +++ b/manifests/remove_exporter.pp @@ -12,7 +12,7 @@ class { '::nfs': server_enabled => false } - + $dbs = ['pe-activity', 'pe-classifier', 'pe-inventory', 'pe-puppetdb', 'pe-rbac', 'pe-orchestrator'] $dbs.each |$db|{ @@ -30,6 +30,16 @@ } + $droprole_cmd = 'DROP ROLE rsan' + pe_postgresql_psql { "${droprole_cmd} ": + command => $droprole_cmd, + db => pe-puppetdb, + port => $pe_postgresql::server::port, + psql_user => $pe_postgresql::server::user, + psql_group => $pe_postgresql::server::group, + psql_path => $pe_postgresql::server::psql_path, + require => Pe_postgresql_psql["${dropowned_cmd} on pe-puppetdb"], + } } diff --git a/spec/classes/importer_spec.rb b/spec/classes/importer_spec.rb index dccdafb..8fe7efb 100644 --- a/spec/classes/importer_spec.rb +++ b/spec/classes/importer_spec.rb @@ -4,13 +4,14 @@ describe 'rsan::importer' do before :each do - Puppet::Parser::Functions.newfunction(:puppetdb_query, :type => :rvalue, :arity => 1) do |args| + Puppet::Parser::Functions.newfunction(:puppetdb_query, type: :rvalue, arity: 1) do |_args| [] - end + end end on_supported_os.each do |os, os_facts| context "on #{os}" do let(:facts) { os_facts } + it { is_expected.to compile } end end From a4a75b8a09a89f8ed628cd7826fadbf5e4e639fc Mon Sep 17 00:00:00 2001 From: martyewings Date: Tue, 12 Jan 2021 09:11:59 +0000 Subject: [PATCH 4/8] postgres node detector --- manifests/remove_exporter.pp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/manifests/remove_exporter.pp b/manifests/remove_exporter.pp index 6b60f8c..ed1dc90 100644 --- a/manifests/remove_exporter.pp +++ b/manifests/remove_exporter.pp @@ -13,6 +13,10 @@ server_enabled => false } + + if $facts['pe_postgresql_info'] != undef and $facts['pe_postgresql_info']['installed_server_version'] != '' { + + $dbs = ['pe-activity', 'pe-classifier', 'pe-inventory', 'pe-puppetdb', 'pe-rbac', 'pe-orchestrator'] $dbs.each |$db|{ @@ -41,5 +45,5 @@ require => Pe_postgresql_psql["${dropowned_cmd} on pe-puppetdb"], } - + } } From d6792cd5913acc73263cc7eafd0c541c5b685b0f Mon Sep 17 00:00:00 2001 From: MartyEwings Date: Tue, 12 Jan 2021 11:33:47 +0000 Subject: [PATCH 5/8] Update remove_exporter.pp --- manifests/remove_exporter.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/remove_exporter.pp b/manifests/remove_exporter.pp index ed1dc90..f6070c1 100644 --- a/manifests/remove_exporter.pp +++ b/manifests/remove_exporter.pp @@ -42,7 +42,7 @@ psql_user => $pe_postgresql::server::user, psql_group => $pe_postgresql::server::group, psql_path => $pe_postgresql::server::psql_path, - require => Pe_postgresql_psql["${dropowned_cmd} on pe-puppetdb"], + require => Pe_postgresql_psql["DROP OWNED BY rsan on pe-puppetdb"], } } From 45839ee5e2cc6d1c2427d89d8ecfbb88b2c789b0 Mon Sep 17 00:00:00 2001 From: martyewings Date: Tue, 12 Jan 2021 12:23:23 +0000 Subject: [PATCH 6/8] add uninstaller --- manifests/remove_exporter.pp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/manifests/remove_exporter.pp b/manifests/remove_exporter.pp index f6070c1..d086c91 100644 --- a/manifests/remove_exporter.pp +++ b/manifests/remove_exporter.pp @@ -9,8 +9,16 @@ #Disable NFS Server - class { '::nfs': - server_enabled => false +# class { '::nfs': + # server_enabled => false + #} + + file { '/etc/exports': + ensure => absent, + } + + service {'nfs': + ensure => stopped, } @@ -42,7 +50,7 @@ psql_user => $pe_postgresql::server::user, psql_group => $pe_postgresql::server::group, psql_path => $pe_postgresql::server::psql_path, - require => Pe_postgresql_psql["DROP OWNED BY rsan on pe-puppetdb"], + require => Pe_postgresql_psql['DROP OWNED BY rsan on pe-puppetdb'], } } From 92029c318a6b1922d869d9003654b74cd9027946 Mon Sep 17 00:00:00 2001 From: martyewings Date: Tue, 12 Jan 2021 13:10:22 +0000 Subject: [PATCH 7/8] fix style --- manifests/remove_exporter.pp | 57 +++++++++++++++--------------------- 1 file changed, 24 insertions(+), 33 deletions(-) diff --git a/manifests/remove_exporter.pp b/manifests/remove_exporter.pp index d086c91..e1be121 100644 --- a/manifests/remove_exporter.pp +++ b/manifests/remove_exporter.pp @@ -6,12 +6,7 @@ # include rsan::remove_exporter class rsan::remove_exporter { - -#Disable NFS Server - -# class { '::nfs': - # server_enabled => false - #} + #Disable NFS Server and revert config file { '/etc/exports': ensure => absent, @@ -21,37 +16,33 @@ ensure => stopped, } - if $facts['pe_postgresql_info'] != undef and $facts['pe_postgresql_info']['installed_server_version'] != '' { + $dbs = ['pe-activity', 'pe-classifier', 'pe-inventory', 'pe-puppetdb', 'pe-rbac', 'pe-orchestrator'] + $dbs.each |$db|{ - $dbs = ['pe-activity', 'pe-classifier', 'pe-inventory', 'pe-puppetdb', 'pe-rbac', 'pe-orchestrator'] - $dbs.each |$db|{ - - $dropowned_cmd = 'DROP OWNED BY rsan' - pe_postgresql_psql { "${dropowned_cmd} on ${db}": - command => $dropowned_cmd, - db => $db, - port => $pe_postgresql::server::port, - psql_user => $pe_postgresql::server::user, - psql_group => $pe_postgresql::server::group, - psql_path => $pe_postgresql::server::psql_path, - require => [Class['pe_postgresql::server']] - } + $dropowned_cmd = 'DROP OWNED BY rsan' + pe_postgresql_psql { "${dropowned_cmd} on ${db}": + command => $dropowned_cmd, + db => $db, + port => $pe_postgresql::server::port, + psql_user => $pe_postgresql::server::user, + psql_group => $pe_postgresql::server::group, + psql_path => $pe_postgresql::server::psql_path, + require => [Class['pe_postgresql::server']] + } - } - - - $droprole_cmd = 'DROP ROLE rsan' - pe_postgresql_psql { "${droprole_cmd} ": - command => $droprole_cmd, - db => pe-puppetdb, - port => $pe_postgresql::server::port, - psql_user => $pe_postgresql::server::user, - psql_group => $pe_postgresql::server::group, - psql_path => $pe_postgresql::server::psql_path, - require => Pe_postgresql_psql['DROP OWNED BY rsan on pe-puppetdb'], - } + } + $droprole_cmd = 'DROP ROLE rsan' + pe_postgresql_psql { "${droprole_cmd} ": + command => $droprole_cmd, + db => pe-puppetdb, + port => $pe_postgresql::server::port, + psql_user => $pe_postgresql::server::user, + psql_group => $pe_postgresql::server::group, + psql_path => $pe_postgresql::server::psql_path, + require => Pe_postgresql_psql['DROP OWNED BY rsan on pe-puppetdb'], + } } } From 45f77c2a26b19b9be037f32fc80af0c1885a2d4d Mon Sep 17 00:00:00 2001 From: martyewings Date: Tue, 12 Jan 2021 14:05:40 +0000 Subject: [PATCH 8/8] fix style --- manifests/remove_exporter.pp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/manifests/remove_exporter.pp b/manifests/remove_exporter.pp index e1be121..0614f74 100644 --- a/manifests/remove_exporter.pp +++ b/manifests/remove_exporter.pp @@ -23,16 +23,16 @@ $dropowned_cmd = 'DROP OWNED BY rsan' pe_postgresql_psql { "${dropowned_cmd} on ${db}": - command => $dropowned_cmd, - db => $db, - port => $pe_postgresql::server::port, - psql_user => $pe_postgresql::server::user, - psql_group => $pe_postgresql::server::group, - psql_path => $pe_postgresql::server::psql_path, - require => [Class['pe_postgresql::server']] - } + command => $dropowned_cmd, + db => $db, + port => $pe_postgresql::server::port, + psql_user => $pe_postgresql::server::user, + psql_group => $pe_postgresql::server::group, + psql_path => $pe_postgresql::server::psql_path, + require => [Class['pe_postgresql::server']] + } - } + } $droprole_cmd = 'DROP ROLE rsan' pe_postgresql_psql { "${droprole_cmd} ":