opendev
/
system-config
Code Issues Proposed changes

Add limestone credentials to nodepool's cloud.yaml 

This makes the credentials available so nodepool launcher and builder
can use them.
The limestone credentials have been added to hiera for the nodepool
group.

Change-Id: Idb56db19110e6b30f6231869ff278b90caf99f4b
This commit is contained in:
David Moreau Simard 2018-03-22 17:57:49 -04:00
parent 77e38475fb
commit ead85b623f
No known key found for this signature in database
GPG Key ID: 33A07694CBB71ECC
2 changed files with 108 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
manifests/site.pp
View File

@ -942,6 +942,9 @@ node 'nodepool.openstack.org' {
$linaro_username = hiera('nodepool_linaro_username', 'username')
$linaro_password = hiera('nodepool_linaro_password')
$linaro_project = hiera('nodepool_linaro_project', 'project')
$limestone_username = hiera('nodepool_limestone_username', 'username')
$limestone_password = hiera('nodepool_limestone_password')
$limestone_project = hiera('nodepool_limestone_project', 'project')
$clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
@ -1005,6 +1008,14 @@ node 'nodepool.openstack.org' {
content => hiera('infracloud_chocolate_ssl_cert_file_contents'),
require => Class['::openstackci::nodepool'],
}
file { '/etc/openstack/limestone_cacert.pem':
ensure => present,
owner => 'root',
group => 'root',
mode => '0444',
content => hiera('limestone_ssl_cert_file_contents'),
require => Class['::openstackci::nodepool'],
}
cron { 'mirror_gitgc':
user => 'nodepool',
@ -1051,6 +1062,9 @@ node /^nl\d+\.openstack\.org$/ {
$linaro_username = hiera('nodepool_linaro_username', 'username')
$linaro_password = hiera('nodepool_linaro_password')
$linaro_project = hiera('nodepool_linaro_project', 'project')
$limestone_username = hiera('nodepool_limestone_username', 'username')
$limestone_password = hiera('nodepool_limestone_password')
$limestone_project = hiera('nodepool_limestone_project', 'project')
$clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
class { 'openstack_project::server':
@ -1086,6 +1100,14 @@ node /^nl\d+\.openstack\.org$/ {
content => hiera('infracloud_chocolate_ssl_cert_file_contents'),
require => Class['::openstackci::nodepool_launcher'],
}
file { '/etc/openstack/limestone_cacert.pem':
ensure => present,
owner => 'root',
group => 'root',
mode => '0444',
content => hiera('limestone_ssl_cert_file_contents'),
require => Class['::openstackci::nodepool_launcher'],
}
}
# Node-OS: xenial
@ -1122,6 +1144,9 @@ node /^nb\d+\.openstack\.org$/ {
$linaro_username = hiera('nodepool_linaro_username', 'username')
$linaro_password = hiera('nodepool_linaro_password')
$linaro_project = hiera('nodepool_linaro_project', 'project')
$limestone_username = hiera('nodepool_limestone_username', 'username')
$limestone_password = hiera('nodepool_limestone_password')
$limestone_project = hiera('nodepool_limestone_project', 'project')
$clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
class { 'openstack_project::server':
@ -1162,6 +1187,14 @@ node /^nb\d+\.openstack\.org$/ {
content => hiera('infracloud_chocolate_ssl_cert_file_contents'),
require => Class['::openstackci::nodepool_builder'],
}
file { '/etc/openstack/limestone_cacert.pem':
ensure => present,
owner => 'root',
group => 'root',
mode => '0444',
content => hiera('limestone_ssl_cert_file_contents'),
require => Class['::openstackci::nodepool_builder'],
}
cron { 'mirror_gitgc':
user => 'nodepool',

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

@ -88,3 +88,22 @@ clouds:
project_name: <%= @linaro_project %>
project_domain_name: default
user_domain_name: default
limestone:
regions:
- name: RegionOne
values:
networks:
- name: "Gateway Network"
routes_externally: false
routes_ipv6_externally: true
nat_destination: true
auth:
auth_url: https://osa.continuous.pw:5000
username: <%= @limestone_username %>
password: <%= @limestone_password %>
project_name: <%= @limestone_project %>
user_domain_name: default
project_domain_name: default
api_timeout: 60
identity_api_version: 3
cacert: /etc/openstack/limestone_cacert.pem