From 87959ce5e657af178514982b6ff954b8e2bb0c96 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 13 Nov 2023 09:12:55 +0100 Subject: [PATCH] copr: cleanup credentials: old openstack Complements: 1623f42fea4cf96c789e7f0c9ffcddb83ca9a823 --- .../tasks/setup_provisioning_environment.yml | 1 - roles/copr/backend/templates/keystonerc | 23 ------------------- .../templates/provision/nova_cloud_vars.yml | 17 -------------- 3 files changed, 41 deletions(-) delete mode 100644 roles/copr/backend/templates/keystonerc delete mode 100644 roles/copr/backend/templates/provision/nova_cloud_vars.yml diff --git a/roles/copr/backend/tasks/setup_provisioning_environment.yml b/roles/copr/backend/tasks/setup_provisioning_environment.yml index bd50cdb3b7..06c08d67fa 100644 --- a/roles/copr/backend/tasks/setup_provisioning_environment.yml +++ b/roles/copr/backend/tasks/setup_provisioning_environment.yml @@ -61,7 +61,6 @@ src: "{{ roles_path }}/copr/backend/templates/provision/{{ item }}" dest: "{{ provision_directory }}/{{ item }}" with_items: - - nova_cloud_vars.yml - aws_cloud_vars.yml tags: - provision_config diff --git a/roles/copr/backend/templates/keystonerc b/roles/copr/backend/templates/keystonerc deleted file mode 100644 index c0ff155661..0000000000 --- a/roles/copr/backend/templates/keystonerc +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -# With the addition of Keystone, to use an openstack cloud you should -# authenticate against keystone, which returns a **Token** and **Service -# Catalog**. The catalog contains the endpoint for all services the -# user/tenant has access to - including nova, glance, keystone, swift. -# -# *NOTE*: Using the 2.0 *auth api* does not mean that compute api is 2.0. We -# will use the 1.1 *compute api* -export OS_AUTH_URL={{ copr_nova_auth_url }} - -# With the addition of Keystone we have standardized on the term **tenant** -# as the entity that owns the resources. - -export OS_TENANT_ID={{ copr_nova_tenant_id }} -export OS_TENANT_NAME={{ copr_nova_tenant_name }} - -# In addition to the owning entity (tenant), openstack stores the entity -# performing the action as the **user**. -export OS_USERNAME={{ copr_nova_username }} - -# With Keystone you pass the keystone password. -export OS_PASSWORD={{ copr_password }} diff --git a/roles/copr/backend/templates/provision/nova_cloud_vars.yml b/roles/copr/backend/templates/provision/nova_cloud_vars.yml deleted file mode 100644 index 03cb388eb0..0000000000 --- a/roles/copr/backend/templates/provision/nova_cloud_vars.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -OS_AUTH_URL: "{{ copr_nova_auth_url }}" - -OS_TENANT_ID: "{{ copr_nova_tenant_id }}" -OS_TENANT_NAME: "{{ copr_nova_tenant_name }}" - -OS_USERNAME: "{{ copr_nova_username }}" - -OS_PASSWORD: "{{ copr_password }}" - -flavor_name: "{{ copr_builder_flavor_name }}" -network_name: "{{ copr_builder_network_name }}" -key_name: "{{ copr_builder_key_name }}" -security_groups: "{{ copr_builder_security_groups }}" - -builder_images: - x86_64: "currently unset, use copr_builder_images.openstack.x86_64 config"