From cb48653415675a0c2d8afbd8949f22d4ee19ddb0 Mon Sep 17 00:00:00 2001
From: David Moreau Simard <dmsimard@redhat.com>
Date: Sat, 24 Mar 2018 15:31:27 -0400
Subject: [PATCH] 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
---
 manifests/site.pp                                           | 6 +++---
 .../openstack_project/templates/nodepool/clouds.yaml.erb    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index ea6dfd3fbb..ef849d6751 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -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',
diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
index dae681c58a..ead3ec9bc1 100644
--- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
@@ -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