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

(PUP-9143) Remove reference to ca_location from puppet device #7096

Merged
merged 1 commit into from
Sep 17, 2018
Merged

(PUP-9143) Remove reference to ca_location from puppet device #7096

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: 0 additions & 5 deletions lib/puppet/application/device.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,11 +376,6 @@ def setup

Puppet.settings.use :main, :agent, :device, :ssl

# We need to specify a ca location for all of the SSL-related
# indirected classes to work; in fingerprint mode we just need
# access to the local files and we don't need a ca.
Puppet::SSL::Host.ca_location = :remote

Puppet::Transaction::Report.indirection.terminus_class = :rest

if Puppet[:catalog_cache_terminus]
Expand Down
7 changes: 0 additions & 7 deletions spec/unit/application/device_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@
before :each do
@device.options.stubs(:[])
Puppet[:libdir] = "/dev/null/lib"
Puppet::SSL::Host.stubs(:ca_location=)
Puppet::Transaction::Report.indirection.stubs(:terminus_class=)
Puppet::Resource::Catalog.indirection.stubs(:terminus_class=)
Puppet::Resource::Catalog.indirection.stubs(:cache_class=)
Expand Down Expand Up @@ -219,12 +218,6 @@
@device.setup
end

it "should install a remote ca location" do
Puppet::SSL::Host.expects(:ca_location=).with(:remote)

@device.setup
end

it "should tell the report handler to use REST" do
Puppet::Transaction::Report.indirection.expects(:terminus_class=).with(:rest)

Expand Down