From efdaa9a12a18ac3ba40284b2fc6df9c091cdf6d9 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Wed, 14 Apr 2021 12:19:49 +1000 Subject: [PATCH] Add OSU OSL to nodepool configuration Change-Id: Id97345595a4463617bc1a93675d35e32cfff7d08 --- playbooks/templates/clouds/nodepool_clouds.yaml.j2 | 11 +++++++++++ playbooks/zuul/templates/group_vars/nodepool.yaml.j2 | 3 +++ 2 files changed, 14 insertions(+) diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 index 5cf872484c..7a540def13 100644 --- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 +++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 @@ -142,3 +142,14 @@ clouds: project_name: 'Airship_OpenDev_Test' project_domain_name: CCP_Domain_34466 user_domain_name: CCP_Domain_34466 + osuosl: + regions: + - RegionOne + auth: + auth_url: https://arm-openstack.osuosl.org:5000/v3 + username: '{{ nodepool_osuosl_username }}' + password: '{{ nodepool_osuosl_password }}' + project_name: 'opendevzuul' + project_id: '{{ nodepool_osuosl_project_id }}' + user_domain_name: "Default" + identity_api_version: 3 diff --git a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 index d0a4ac39c4..ca95cd965d 100644 --- a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 @@ -58,3 +58,6 @@ nodepool_packethost_password: password nodepool_packethost_project: project nodepool_airship_username: user nodepool_airship_password: password +nodepool_osuosl_username: user +nodepool_osuosl_password: password +nodepool_osuosl_project_id: project