From 81db207d33fed60fd4809cf3ba28307f5b7c856a Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 13 Apr 2021 13:31:49 +1000 Subject: [PATCH] all-clouds: add OSU OSL project_id as well Otherwise you get BadRequest: Expecting to find domain in project - the server could not comply with the request since it is either malformed or otherwise incorrect. The client is assumed to be in error. Change-Id: If8869fe888c9f1e9c0a487405574d59dd3001b65 --- playbooks/templates/clouds/bridge_all_clouds.yaml.j2 | 2 ++ playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 index 97ec226041..f4da655c5d 100644 --- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 @@ -250,6 +250,7 @@ clouds: username: '{{ clouds.opendevci_osuosl_username }}' password: '{{ clouds.opendevci_osuosl_password }}' project_name: 'opendevci' + project_id: '{{ clouds.opendevci_osuosl_project_id }}' user_domain_name: "Default" identity_api_version: 3 opendevzuul-osuosl: @@ -260,5 +261,6 @@ clouds: username: '{{ clouds.opendevzuul_osuosl_username }}' password: '{{ clouds.opendevzuul_osuosl_password }}' project_name: 'opendevzuul' + project_id: '{ clouds.opendevci_osuosl_project_id }}' user_domain_name: "Default" identity_api_version: 3 diff --git a/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 b/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 index 893a4b0d6c..b6bd4f5c0f 100644 --- a/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 +++ b/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 @@ -58,8 +58,10 @@ clouds: opendevzuul_airship_password: password opendevci_osuosl_username: user opendevci_osuosl_password: password + opendevci_osuosl_project_id: project opendevzuul_osuosl_username: user opendevzuul_osuosl_password: password + opendevzuul_osuosl_project_id: project gitea_kube_key: Z2l0ZWFfazhzX2tleQ== ansible_cron_disable_job: true