Skip to content
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

Jump to bottom

Handle setup playbook failure better #15313

Merged
merged 2 commits into from
Jun 6, 2017
Merged

Handle setup playbook failure better #15313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42eb2f8
Handle additional case for /etc/tower/SECRET_KEY
carbonin Jun 5, 2017
f80e6dd
Remove the secret key from the database when the setup fails
carbonin Jun 6, 2017
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 lib/embedded_ansible.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def self.running?
end

def self.configured?
return false unless File.exist?(SECRET_KEY_FILE)
key = miq_database.ansible_secret_key
key.present? && key == File.read(SECRET_KEY_FILE)
end
Expand Down Expand Up @@ -98,6 +99,10 @@ def self.run_setup_script(exclude_tags)
}
AwesomeSpawn.run!(SETUP_SCRIPT, :params => params)
end
rescue AwesomeSpawn::CommandResultError => e
_log.error("EmbeddedAnsible setup script failed with: #{e.message}")
miq_database.ansible_secret_key = nil
raise
end
private_class_method :run_setup_script

Expand Down
18 changes: 17 additions & 1 deletion spec/lib/embedded_ansible_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,12 @@

expect(described_class.configured?).to be false
end

it "returns false when the file doesn't exist and there is a value in the database" do
key_file.unlink
miq_database.ansible_secret_key = "password"
expect(described_class.configured?).to be false
end
end

describe ".configure_secret_key (private)" do
Expand All @@ -256,10 +262,10 @@
before do
expect(described_class).to receive(:configured?).and_return(false)
expect(described_class).to receive(:configure_secret_key)
expect(described_class).to receive(:alive?).and_return(true)
end

it "generates new passwords with no passwords set" do
expect(described_class).to receive(:alive?).and_return(true)
expect(described_class).to receive(:generate_database_authentication).and_return(double(:userid => "awx", :password => "databasepassword"))
expect(AwesomeSpawn).to receive(:run!) do |script_path, options|
params = options[:params]
Expand All @@ -284,6 +290,7 @@
end

it "uses the existing passwords when they are set in the database" do
expect(described_class).to receive(:alive?).and_return(true)
miq_database.set_ansible_admin_authentication(:password => "adminpassword")
miq_database.set_ansible_rabbitmq_authentication(:userid => "rabbituser", :password => "rabbitpassword")
miq_database.set_ansible_database_authentication(:userid => "databaseuser", :password => "databasepassword")
Expand All @@ -306,6 +313,15 @@

described_class.start
end

it "removes the secret key from the database when setup fails" do
miq_database.ansible_secret_key = "supersecretkey"
expect(described_class).to receive(:generate_database_authentication).and_return(double(:userid => "awx", :password => "databasepassword"))

expect(AwesomeSpawn).to receive(:run!).and_raise(AwesomeSpawn::CommandResultError.new("error", 1))
expect { described_class.start }.to raise_error(AwesomeSpawn::CommandResultError)
expect(miq_database.reload.ansible_secret_key).not_to be_present
end
end

describe ".generate_database_authentication (private)" do
Expand Down