Skip to content

Commit 2b254b2

Browse files
committed
(maint) Removes cert conditionals
Puppet 6 removed the `puppet cert` command in favor of `puppetserver ca` commands. As this module no longer supports Puppet 5 or earlier, this commit removes the conditionals in the acceptance helpers that supported `puppet cert`.
1 parent 78511ea commit 2b254b2

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

acceptance/helpers.rb

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,6 @@ def set_up_initial_agent_on(host, initial_package_version_or_collection)
252252
on(host, puppet('resource', 'service', 'puppet', 'ensure=stopped'))
253253
end
254254

255-
server_version = puppetserver_version_on(master)
256-
257255
step '(Agent) configure server setting on agent' do
258256
on(host, puppet("config set server #{master}"))
259257
end
@@ -264,11 +262,7 @@ def set_up_initial_agent_on(host, initial_package_version_or_collection)
264262

265263
agent_certname = fact_on(host, 'fqdn')
266264
step '(Master) Sign certs' do
267-
if version_is_less('5.99.99', server_version)
268-
on(master, "puppetserver ca sign --certname #{agent_certname}")
269-
else
270-
on(master, puppet("cert sign #{agent_certname}"))
271-
end
265+
on(master, "puppetserver ca sign --certname #{agent_certname}")
272266
end
273267

274268
teardowns << -> do
@@ -401,11 +395,7 @@ def remove_installed_agent(host)
401395
# @param [String] agent_certname The name of the cert to remove from the master
402396
def clean_agent_certificate(agent_certname)
403397
step "Teardown: (Master) Clean agent #{agent_certname} cert" do
404-
if version_is_less('5.99.99', puppetserver_version_on(master))
405-
on(master, "puppetserver ca clean --certname #{agent_certname}")
406-
else
407-
on(master, puppet("cert clean #{agent_certname}"))
408-
end
398+
on(master, "puppetserver ca clean --certname #{agent_certname}")
409399
end
410400
end
411401
end

0 commit comments

Comments
 (0)