@@ -65,8 +65,14 @@ def reset_target_host
65
65
def configure_puppet_server ( controller , worker1 , worker2 )
66
66
# Configure the puppet server
67
67
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' )
70
76
execute_agent ( 'controller' )
71
77
# Configure the puppet agents
72
78
configure_puppet_agent ( 'worker1' )
@@ -112,6 +118,7 @@ class {'kubernetes':
112
118
def configure_puppet_agent ( role )
113
119
# Configure the puppet agents
114
120
ENV [ 'TARGET_HOST' ] = target_roles ( role ) [ 0 ] [ :name ]
121
+ run_shell ( 'sudo rm -rf $(puppet config print ssldir --section agent)' )
115
122
run_shell ( 'systemctl start puppet' )
116
123
run_shell ( 'systemctl enable puppet' )
117
124
execute_agent ( role )
@@ -120,7 +127,7 @@ def configure_puppet_agent(role)
120
127
def puppet_cert_sign
121
128
# Sign the certs
122
129
ENV [ 'TARGET_HOST' ] = target_roles ( 'controller' ) [ 0 ] [ :name ]
123
- run_shell ( " puppetserver ca sign --all" , expect_failures : true )
130
+ run_shell ( 'sudo puppetserver ca sign --all' , expect_failures : true )
124
131
end
125
132
126
133
def clear_certs ( role )
@@ -158,8 +165,8 @@ def execute_agent(role)
158
165
run_shell ( 'puppet module install puppetlabs-apt' )
159
166
run_shell ( 'puppet module install maestrodev-wget' )
160
167
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' )
168
+ run_shell ( 'puppet module install puppet -augeasproviders_sysctl' )
169
+ run_shell ( 'puppet module install puppet -augeasproviders_core' )
163
170
run_shell ( 'puppet module install puppet-kmod' )
164
171
run_shell ( 'puppet module install puppetlabs-docker' )
165
172
run_shell ( 'puppet module install puppetlabs-helm' )
0 commit comments