opendev
/
system-config
Code Issues Proposed changes

Merge "Add linaro cloud to nodepool clouds.yaml"

This commit is contained in:
Zuul 2018-02-23 03:37:38 +00:00 committed by Gerrit Code Review
parent e59b6cd4a8 2869020b49
commit aafe59b529
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/site.pp
View File

@ -929,6 +929,10 @@ node 'nodepool.openstack.org' {
$vexxhost_project = hiera('nodepool_vexxhost_project', 'project')
$citycloud_username = hiera('nodepool_citycloud_username', 'username')
$citycloud_password = hiera('nodepool_citycloud_password')
$linaro_username = hiera('nodepool_linaro_username', 'username')
$linaro_password = hiera('nodepool_linaro_password')
$linaro_project = hiera('nodepool_linaro_project', 'project')
$clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
class { 'openstack_project::server':
@ -1034,6 +1038,9 @@ node /^nl\d+\.openstack\.org$/ {
$vexxhost_project = hiera('nodepool_vexxhost_project', 'project')
$citycloud_username = hiera('nodepool_citycloud_username', 'username')
$citycloud_password = hiera('nodepool_citycloud_password')
$linaro_username = hiera('nodepool_linaro_username', 'username')
$linaro_password = hiera('nodepool_linaro_password')
$linaro_project = hiera('nodepool_linaro_project', 'project')
$clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
class { 'openstack_project::server':
@ -1100,6 +1107,9 @@ node /^nb\d+\.openstack\.org$/ {
$vexxhost_project = hiera('nodepool_vexxhost_project', 'project')
$citycloud_username = hiera('nodepool_citycloud_username', 'username')
$citycloud_password = hiera('nodepool_citycloud_password')
$linaro_username = hiera('nodepool_linaro_username', 'username')
$linaro_password = hiera('nodepool_linaro_password')
$linaro_project = hiera('nodepool_linaro_project', 'project')
$clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
class { 'openstack_project::server':

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

@ -76,3 +76,14 @@ clouds:
project_id: bed89257500340af8d0fbe7141b1bfd6
project_domain_id: a5e7d1a8f25b42b081cf89d1130638da
user_domain_id: a5e7d1a8f25b42b081cf89d1130638da
linaro:
regions:
- RegionOne
identity_api_version: '3'
auth:
auth_url: https://cn1.linaro.cloud:35357
username: <%= @linaro_username %>
password: <%= @linaro_password %>
project_name: <%= @linaro_project %>
project_domain_name: default
user_domain_name: default