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

Remove the manageiq from the ansible deployment config name #15971

Merged
merged 1 commit into from
Sep 14, 2017
Merged

Remove the manageiq from the ansible deployment config name #15971

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
2 changes: 1 addition & 1 deletion lib/embedded_ansible.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class EmbeddedAnsible
HTTPS_PORT = 54_322
WAIT_FOR_ANSIBLE_SLEEP = 1.second
TOWER_VERSION_FILE = "/var/lib/awx/.tower_version".freeze
ANSIBLE_DC_NAME = "manageiq-ansible".freeze
ANSIBLE_DC_NAME = "ansible".freeze

def self.available?
return true if MiqEnvironment::Command.is_container?
Expand Down
6 changes: 3 additions & 3 deletions spec/lib/embedded_ansible_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@
orch = double("ContainerOrchestrator")
expect(ContainerOrchestrator).to receive(:new).and_return(orch)

expect(orch).to receive(:scale).with("manageiq-ansible", 0)
expect(orch).to receive(:scale).with("ansible", 0)

described_class.stop
end
Expand All @@ -433,7 +433,7 @@
orch = double("ContainerOrchestrator")
expect(ContainerOrchestrator).to receive(:new).and_return(orch)

expect(orch).to receive(:scale).with("manageiq-ansible", 0)
expect(orch).to receive(:scale).with("ansible", 0)

described_class.disable
end
Expand All @@ -450,7 +450,7 @@
orch = double("ContainerOrchestrator")
expect(ContainerOrchestrator).to receive(:new).and_return(orch)

expect(orch).to receive(:scale).with("manageiq-ansible", 1)
expect(orch).to receive(:scale).with("ansible", 1)
expect(described_class).to receive(:alive?).and_return(true)

described_class.start
Expand Down