opendev/system-config
Code Issues Proposed changes

Merge "Add limestone credentials to nodepool's cloud.yaml"

Browse Source
This commit is contained in:
Zuul 2018-03-23 00:24:31 +00:00 committed by Gerrit Code Review
commit cec61a61e1
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

@ -989,6 +989,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")
@ -1052,6 +1055,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',
@ -1098,6 +1109,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':
@ -1133,6 +1147,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
@ -1169,6 +1191,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':
@ -1209,6 +1234,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