Merge "Put infracloud cert next to nodepool clouds.yaml"

manifests/site.pp

@@ -674,13 +674,6 @@ node 'nodepool.openstack.org' {
   $infracloud_password = hiera('nodepool_infracloud_password')
   $infracloud_project  = hiera('nodepool_infracloud_project', 'project')
   $clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
-  file { '/etc/openstack/infracloud_west_cacert.pem':
-    ensure  => present,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0600',
-    content => hiera('infracloud_hpuswest_ssl_cert_file_contents'),
-  }
   class { 'openstack_project::server':
     sysadmins                 => hiera('sysadmins', []),
     iptables_public_tcp_ports => [80],
@@ -749,6 +742,14 @@ node 'nodepool.openstack.org' {
       },
     ],
   }
+  file { '/home/nodepool/.config/openstack/infracloud_west_cacert.pem':
+    ensure  => present,
+    owner   => 'nodepool',
+    group   => 'nodepool',
+    mode    => '0600',
+    content => hiera('infracloud_hpuswest_ssl_cert_file_contents'),
+    require => Class['::openstackci::nodepool'],
+  }
 }
 
 # Node-OS: precise

modules/openstack_project/templates/nodepool/clouds.yaml.erb

@@ -56,6 +56,6 @@ clouds:
       project_domain_name: 'infra'
       auth_url: 'https://controller00.hpuswest.ic.openstack.org:35357/v3'
     auth_type: 'v3password'
-    cacert: '/etc/openstack/infracloud_west_cacert.pem'
+    cacert: '/home/nodepool/.config/openstack/infracloud_west_cacert.pem'
     identity_api_version: '3'
     floating_ip_source: 'None'