Skip to content

Commit 3b2f50f

Browse files
committed
(CONT-914) - Address CI Failures
1 parent 0399693 commit 3b2f50f

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"version_requirement": ">= 2.0.0 < 7.0.0"
2222
},
2323
{
24-
"name": "herculesteam-augeasproviders_sysctl",
25-
"version_requirement": ">= 2.2.1 < 3.0.0"
24+
"name": "puppet-augeasproviders_sysctl",
25+
"version_requirement": ">= 3.0.0 < 4.0.0"
2626
},
2727
{
2828
"name": "puppet-augeasproviders_core",

spec/spec_helper_acceptance_local.rb

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,14 @@ def reset_target_host
6565
def configure_puppet_server(controller, worker1, worker2)
6666
# Configure the puppet server
6767
ENV['TARGET_HOST'] = target_roles('controller')[0][:name]
68-
run_shell('systemctl start puppetserver')
69-
run_shell('systemctl enable puppetserver')
68+
# regerate the certs
69+
run_shell('sudo puppet resource service puppet ensure=stopped')
70+
run_shell('sudo puppet resource service puppetserver ensure=stopped')
71+
run_shell('sudo rm -r /etc/puppetlabs/puppet/ssl')
72+
run_shell('sudo rm -rf /etc/puppetlabs/puppetserver/ca')
73+
run_shell('sudo puppetserver ca setup')
74+
run_shell('sudo puppet resource service puppet ensure=running')
75+
run_shell('sudo puppet resource service puppetserver ensure=running')
7076
execute_agent('controller')
7177
# Configure the puppet agents
7278
configure_puppet_agent('worker1')
@@ -112,15 +118,15 @@ class {'kubernetes':
112118
def configure_puppet_agent(role)
113119
# Configure the puppet agents
114120
ENV['TARGET_HOST'] = target_roles(role)[0][:name]
115-
run_shell('systemctl start puppet')
116-
run_shell('systemctl enable puppet')
121+
run_shell('sudo rm -rf $(puppet config print ssldir --section agent)')
122+
run_shell('sudo puppet resource service puppet ensure=running')
117123
execute_agent(role)
118124
end
119125

120126
def puppet_cert_sign
121127
# Sign the certs
122128
ENV['TARGET_HOST'] = target_roles('controller')[0][:name]
123-
run_shell("puppetserver ca sign --all", expect_failures: true)
129+
run_shell('sudo puppetserver ca sign --all', expect_failures: true)
124130
end
125131

126132
def clear_certs(role)
@@ -158,8 +164,8 @@ def execute_agent(role)
158164
run_shell('puppet module install puppetlabs-apt')
159165
run_shell('puppet module install maestrodev-wget')
160166
run_shell('puppet module install puppet-archive')
161-
run_shell('puppet module install herculesteam-augeasproviders_sysctl')
162-
run_shell('puppet module install herculesteam-augeasproviders_core')
167+
run_shell('puppet module install puppet-augeasproviders_sysctl')
168+
run_shell('puppet module install puppet-augeasproviders_core')
163169
run_shell('puppet module install puppet-kmod')
164170
run_shell('puppet module install puppetlabs-docker')
165171
run_shell('puppet module install puppetlabs-helm')

0 commit comments

Comments
 (0)