Put infracloud cert next to nodepool clouds.yaml
We are installing a cert to trust the infracloud but were trying to put it in a dir that does not exist. Put it next to the clouds.yaml in ~nodepool/.config/openstack as that will exist because nodepool consumes clouds.yaml from there. Change-Id: I27e1a1d340e9864308c89c660ae014d7110fbe9f
This commit is contained in:
parent
9288fed03c
commit
2207a1ac2b
@ -674,13 +674,6 @@ node 'nodepool.openstack.org' {
|
|||||||
$infracloud_password = hiera('nodepool_infracloud_password')
|
$infracloud_password = hiera('nodepool_infracloud_password')
|
||||||
$infracloud_project = hiera('nodepool_infracloud_project', 'project')
|
$infracloud_project = hiera('nodepool_infracloud_project', 'project')
|
||||||
$clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
|
$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':
|
class { 'openstack_project::server':
|
||||||
sysadmins => hiera('sysadmins', []),
|
sysadmins => hiera('sysadmins', []),
|
||||||
iptables_public_tcp_ports => [80],
|
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
|
# Node-OS: precise
|
||||||
|
@ -56,6 +56,6 @@ clouds:
|
|||||||
project_domain_name: 'infra'
|
project_domain_name: 'infra'
|
||||||
auth_url: 'https://controller00.hpuswest.ic.openstack.org:35357/v3'
|
auth_url: 'https://controller00.hpuswest.ic.openstack.org:35357/v3'
|
||||||
auth_type: 'v3password'
|
auth_type: 'v3password'
|
||||||
cacert: '/etc/openstack/infracloud_west_cacert.pem'
|
cacert: '/home/nodepool/.config/openstack/infracloud_west_cacert.pem'
|
||||||
identity_api_version: '3'
|
identity_api_version: '3'
|
||||||
floating_ip_source: 'None'
|
floating_ip_source: 'None'
|
||||||
|
Loading…
Reference in New Issue
Block a user