From 2869020b49a8f3d697096d8c0d55096614472070 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 22 Feb 2018 12:09:11 +1100 Subject: [PATCH] Add linaro cloud to nodepool clouds.yaml I have added the keys in hiera Change-Id: Ief447157bb1e14024b8ae5b06dddb8d12b2f62db --- manifests/site.pp | 10 ++++++++++ .../templates/nodepool/clouds.yaml.erb | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/manifests/site.pp b/manifests/site.pp index dcb06d99bf..0a0ffc5d7a 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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': diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb index 8209401b19..a4af0aaad6 100644 --- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb +++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb @@ -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