opendev
/
system-config
Code Issues Proposed changes

Fix bad path for limestone certificate on nodepool servers 

Copy/pasta from puppetmaster.o.o meant that we tried to put and use
the certificate in /etc/openstack/ which is not a thing on nodepool
nodes.

Fix that to be the right location and update the nodepool clouds.yaml.

Change-Id: Ib9c17a58fc2aa9ad5eb9091a6a3fd23ff5825731
This commit is contained in:
David Moreau Simard 2018-03-24 15:31:27 -04:00
parent 956d953b9a
commit cb48653415
No known key found for this signature in database
GPG Key ID: 33A07694CBB71ECC
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/site.pp
View File

@ -1055,7 +1055,7 @@ node 'nodepool.openstack.org' {
content => hiera('infracloud_chocolate_ssl_cert_file_contents'),
require => Class['::openstackci::nodepool'],
}
file { '/etc/openstack/limestone_cacert.pem':
file { '/home/nodepool/.config/openstack/limestone_cacert.pem':
ensure => present,
owner => 'root',
group => 'root',
@ -1147,7 +1147,7 @@ node /^nl\d+\.openstack\.org$/ {
content => hiera('infracloud_chocolate_ssl_cert_file_contents'),
require => Class['::openstackci::nodepool_launcher'],
}
file { '/etc/openstack/limestone_cacert.pem':
file { '/home/nodepool/.config/openstack/limestone_cacert.pem':
ensure => present,
owner => 'root',
group => 'root',
@ -1234,7 +1234,7 @@ node /^nb\d+\.openstack\.org$/ {
content => hiera('infracloud_chocolate_ssl_cert_file_contents'),
require => Class['::openstackci::nodepool_builder'],
}
file { '/etc/openstack/limestone_cacert.pem':
file { '/home/nodepool/.config/openstack/limestone_cacert.pem':
ensure => present,
owner => 'root',
group => 'root',

2
modules/openstack_project/templates/nodepool/clouds.yaml.erb
View File

@ -106,4 +106,4 @@ clouds:
project_domain_name: default
api_timeout: 60
identity_api_version: 3
cacert: /etc/openstack/limestone_cacert.pem
cacert: /home/nodepool/.config/openstack/limestone_cacert.pem