diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 index 8798a7009d..e131b31d61 100644 --- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 @@ -149,27 +149,25 @@ clouds: project_id: '{{ clouds.opendevzuul_osuosl_project_id }}' user_domain_name: "Default" identity_api_version: 3 - opendevci-inmotion: + opendevci-openmetal: regions: - - iad3 + - IAD3 auth: - auth_url: 'https://173.231.255.228:5000' - username: '{{ clouds.opendevci_inmotion_username }}' - password: '{{ clouds.opendevci_inmotion_password }}' + auth_url: 'https://openmetal.us-east.opendev.org:5000' + username: '{{ clouds.opendevci_openmetal_username }}' + password: '{{ clouds.opendevci_openmetal_password }}' project_name: 'opendevci' - project_id: '{{ clouds.opendevci_inmotion_project_id }}' + project_id: '{{ clouds.opendevci_openmetal_project_id }}' user_domain_name: "Default" identity_api_version: 3 - cacert: {{ openstacksdk_config_dir }}/inmotion_cacert.pem - opendevzuul-inmotion: + opendevzuul-openmetal: regions: - - iad3 + - IAD3 auth: - auth_url: 'https://173.231.255.228:5000' - username: '{{ clouds.opendevzuul_inmotion_username }}' - password: '{{ clouds.opendevzuul_inmotion_password }}' + auth_url: 'https://openmetal.us-east.opendev.org:5000' + username: '{{ clouds.opendevzuul_openmetal_username }}' + password: '{{ clouds.opendevzuul_openmetal_password }}' project_name: 'opendevzuul' - project_id: '{{ clouds.opendevzuul_inmotion_project_id }}' + project_id: '{{ clouds.opendevzuul_openmetal_project_id }}' user_domain_name: "Default" - identity_api_version: 3 - cacert: {{ openstacksdk_config_dir }}/inmotion_cacert.pem + identity_api_version: 3 \ No newline at end of file diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 index 869ae53673..3ebc6b5005 100644 --- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 +++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 @@ -126,9 +126,9 @@ clouds: floating_ip_source: None identity_api_version: 3 image_format: 'raw' - inmotion: + openmetal: regions: - - name: iad3 + - name: IAD3 values: networks: - name: External @@ -136,14 +136,13 @@ clouds: default_interface: true metrics: statsd: - prefix: 'nodepool.task.inmotion-iad3' + prefix: 'nodepool.task.openmetal-iad3' auth: - auth_url: 'https://173.231.255.228:5000' - username: '{{ nodepool_inmotion_username }}' - password: '{{ nodepool_inmotion_password }}' + auth_url: 'https://openmetal.us-east.opendev.org:5000' + username: '{{ nodepool_openmetal_username }}' + password: '{{ nodepool_openmetal_password }}' project_name: 'opendevzuul' - project_id: '{{ nodepool_inmotion_project_id }}' + project_id: '{{ nodepool_openmetal_project_id }}' user_domain_name: "Default" identity_api_version: 3 image_format: 'raw' - cacert: {{ openstacksdk_config_dir }}/inmotion_cacert.pem diff --git a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 index 3fe240b11a..d8fe34b931 100644 --- a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 @@ -56,3 +56,9 @@ clouds: opendevzuul_inmotion_username: user opendevzuul_inmotion_password: password opendevzuul_inmotion_project_id: project + opendevci_openmetal_username: user + opendevci_openmetal_password: password + opendevci_openmetal_project_id: project + opendevzuul_openmetal_username: user + opendevzuul_openmetal_password: password + opendevzuul_openmetal_project_id: project \ No newline at end of file diff --git a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 index e7ce310757..fc881d6d06 100644 --- a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 @@ -52,3 +52,6 @@ nodepool_osuosl_project_id: project nodepool_inmotion_username: user nodepool_inmotion_password: password nodepool_inmotion_project_id: project +nodepool_openmetal_username: user +nodepool_openmetal_password: password +nodepool_openmetal_project_id: project