Procházet zdrojové kódy

Pass through app credentials to tox and github

Nuwan Goonasekera před 3 roky
rodič
revize
1bc31faa19

+ 2 - 0
.github/workflows/integration.yaml

@@ -98,6 +98,8 @@ jobs:
           OS_USERNAME: ${{ secrets.OS_USERNAME }}
           OS_REGION_NAME: ${{ secrets.OS_REGION_NAME }}
           OS_USER_DOMAIN_NAME: ${{ secrets.OS_USER_DOMAIN_NAME }}
+          OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
+          OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
           CB_IMAGE_OS: ${{ secrets.CB_IMAGE_OS }}
           CB_PLACEMENT_OS: ${{ secrets.CB_PLACEMENT_OS }}
 

+ 1 - 1
docs/topics/object_storage.rst

@@ -93,7 +93,7 @@ get an object.
 
     url = obj.generate_url(expires_in=7200)
 
-You can also generate a signed URL with `PUT``permissions to allow users 
+You can also generate a signed URL with `PUT` permissions to allow users
 to upload files to your storage bucket.
 
 .. code-block:: python

+ 43 - 39
docs/topics/setup.rst

@@ -298,45 +298,49 @@ GCP
 OpenStack
 ~~~~~~~~~
 
-+------------------------+-----------+
-| Variable               | Required? |
-+========================+===========+
-| OS_AUTH_URL            | ✔         |
-+------------------------+-----------+
-| OS_USERNAME            | ✔         |
-+------------------------+-----------+
-| OS_PASSWORD            | ✔         |
-+------------------------+-----------+
-| OS_PROJECT_NAME        | ✔         |
-+------------------------+-----------+
-| OS_REGION_NAME         | ✔         |
-+------------------------+-----------+
-| OS_ZONE_NAME           | ✔         |
-+------------------------+-----------+
-| OS_COMPUTE_ZONE_NAME   |           |
-+------------------------+-----------+
-| OS_NETWORKING_ZONE_NAME|           |
-+------------------------+-----------+
-| OS_SECURITY_ZONE_NAME  |           |
-+------------------------+-----------+
-| OS_STORAGE_ZONE_NAME   |           |
-+------------------------+-----------+
-| NOVA_SERVICE_NAME      |           |
-+------------------------+-----------+
-| OS_AUTH_TOKEN          |           |
-+------------------------+-----------+
-| OS_COMPUTE_API_VERSION |           |
-+------------------------+-----------+
-| OS_VOLUME_API_VERSION  |           |
-+------------------------+-----------+
-| OS_STORAGE_URL         |           |
-+------------------------+-----------+
-| OS_PROJECT_DOMAIN_ID   |           |
-+------------------------+-----------+
-| OS_PROJECT_DOMAIN_NAME |           |
-+------------------------+-----------+
-| OS_USER_DOMAIN_NAME    |           |
-+------------------------+-----------+
++----------------------------------+-----------+
+| Variable                         | Required? |
++==================================+===========+
+| OS_AUTH_URL                      | ✔         |
++----------------------------------+-----------+
+| OS_USERNAME                      | ✔?        |
++----------------------------------+-----------+
+| OS_PASSWORD                      | ✔?        |
++----------------------------------+-----------+
+| OS_APPLICATION_CREDENTIAL_ID     | ✔?        |
++----------------------------------+-----------+
+| OS_APPLICATION_CREDENTIAL_SECRET | ✔?        |
++----------------------------------+-----------+
+| OS_PROJECT_NAME                  | ✔         |
++----------------------------------+-----------+
+| OS_REGION_NAME                   | ✔         |
++----------------------------------+-----------+
+| OS_ZONE_NAME                     | ✔         |
++----------------------------------+-----------+
+| OS_COMPUTE_ZONE_NAME             |           |
++----------------------------------+-----------+
+| OS_NETWORKING_ZONE_NAME          |           |
++----------------------------------+-----------+
+| OS_SECURITY_ZONE_NAME            |           |
++----------------------------------+-----------+
+| OS_STORAGE_ZONE_NAME             |           |
++----------------------------------+-----------+
+| NOVA_SERVICE_NAME                |           |
++----------------------------------+-----------+
+| OS_AUTH_TOKEN                    |           |
++----------------------------------+-----------+
+| OS_COMPUTE_API_VERSION           |           |
++----------------------------------+-----------+
+| OS_VOLUME_API_VERSION            |           |
++----------------------------------+-----------+
+| OS_STORAGE_URL                   |           |
++----------------------------------+-----------+
+| OS_PROJECT_DOMAIN_ID             |           |
++----------------------------------+-----------+
+| OS_PROJECT_DOMAIN_NAME           |           |
++----------------------------------+-----------+
+| OS_USER_DOMAIN_NAME              |           |
++----------------------------------+-----------+
 
 Once the environment variables are set, you can create a connection as follows,
 replacing ``ProviderList.AWS`` with the desired provider (AZURE, GCP, or

+ 1 - 1
tox.ini

@@ -26,7 +26,7 @@ passenv =
     aws: CB_IMAGE_AWS CB_INSTANCE_TYPE_AWS CB_PLACEMENT_AWS AWS_ACCESS_KEY AWS_SECRET_KEY
     azure: CB_IMAGE_AZURE AZURE_SUBSCRIPTION_ID AZURE_CLIENT_ID AZURE_SECRET AZURE_TENANT AZURE_REGION_NAME AZURE_RESOURCE_GROUP AZURE_STORAGE_ACCOUNT AZURE_VM_DEFAULT_USER_NAME AZURE_PUBLIC_KEY_STORAGE_TABLE_NAME
     gcp: CB_IMAGE_GCP CB_INSTANCE_TYPE_GCP CB_PLACEMENT_GCP GCP_DEFAULT_REGION GCP_DEFAULT_ZONE GCP_PROJECT_NAME GCP_SERVICE_CREDS_FILE GCP_SERVICE_CREDS_DICT
-    openstack:  CB_IMAGE_OS CB_INSTANCE_TYPE_OS CB_PLACEMENT_OS OS_AUTH_URL OS_PASSWORD OS_PROJECT_NAME OS_TENANT_NAME OS_USERNAME OS_REGION_NAME OS_USER_DOMAIN_NAME OS_PROJECT_DOMAIN_NAME NOVA_SERVICE_NAME
+    openstack:  CB_IMAGE_OS CB_INSTANCE_TYPE_OS CB_PLACEMENT_OS OS_AUTH_URL OS_PASSWORD OS_PROJECT_NAME OS_TENANT_NAME OS_USERNAME OS_REGION_NAME OS_USER_DOMAIN_NAME OS_PROJECT_DOMAIN_NAME NOVA_SERVICE_NAME OS_APPLICATION_CREDENTIAL_ID OS_APPLICATION_CREDENTIAL_SECRET
     mock: CB_IMAGE_AWS CB_INSTANCE_TYPE_AWS CB_PLACEMENT_AWS AWS_ACCESS_KEY AWS_SECRET_KEY
 deps =
     -rrequirements.txt