Skip to content

Fixes #32885: Remove puppet from foreman::user_groups if present #690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ekohl merged 1 commit into from
Jul 12, 2021
Merged

Fixes #32885: Remove puppet from foreman::user_groups if present #690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions config/foreman.migrations/20210625142707_dynamic_puppet_in_foreman_groups.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
if answers['foreman'].is_a?(Hash)
if answers['foreman']['user_groups'] && answers['foreman']['user_groups'].include?('puppet')
answers['foreman']['user_groups'].delete('puppet')
end
end
1 change: 0 additions & 1 deletion config/katello-answers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ foreman:
server_ssl_chain: /etc/pki/katello/certs/katello-server-ca.crt
server_ssl_crl: ""
server_ssl_key: /etc/pki/katello/private/katello-apache.key
user_groups: []
Copy link
Copy Markdown
Member Author

@ehelms ehelms Jun 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I figured this does not need to be here anymore.

foreman::cli: true
foreman::cli::ansible: false
foreman::cli::azure: false
Expand Down
5 changes: 0 additions & 5 deletions config/katello.migrations/190314163941-remove-foreman-user-groups.rb
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions config/katello.migrations/210625142712-dynamic-puppet-in-foreman-groups.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
if answers['foreman'].is_a?(Hash)
if answers['foreman']['user_groups'] && answers['foreman']['user_groups'].include?('puppet')
answers['foreman']['user_groups'].delete('puppet')
end
end
2 changes: 2 additions & 0 deletions spec/fixtures/cleanup-foreman-user-groups/foreman-answers-after.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
foreman:
user_groups: []
2 changes: 2 additions & 0 deletions spec/fixtures/cleanup-foreman-user-groups/foreman-answers-before.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
foreman:
user_groups: ['puppet']
2 changes: 2 additions & 0 deletions spec/fixtures/cleanup-foreman-user-groups/katello-answers-after.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
foreman:
user_groups: []
2 changes: 2 additions & 0 deletions spec/fixtures/cleanup-foreman-user-groups/katello-answers-before.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
foreman:
user_groups: ['puppet']
20 changes: 20 additions & 0 deletions spec/migration_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,24 @@
end
end
end

%w[foreman katello].each do |scenario_name|
context "foreman drop puppet from user_groups" do
let(:answers_after) { load_fixture_yaml('cleanup-foreman-user-groups', "#{scenario_name}-answers-after.yaml") }
let(:scenario) do
{
:answers => load_fixture_yaml('cleanup-foreman-user-groups', "#{scenario_name}-answers-before.yaml"),
:config => load_config_yaml("#{scenario_name}.yaml"),
:migrations => config_path("#{scenario_name}.migrations"),
}
end

let(:migrator) { Kafo::Migrations.new(scenario[:migrations]).run(scenario[:config], scenario[:answers]) }

it 'changes scenario answers' do
_, after = migrator
expect(after).to include answers_after
end
end
end
end