Cybl 1115 add tenant (#393)

* add tenant_id for backward compatibility

* update circleci config

* code review fixes

* __NODOCS__

Author: AdarShaked

.circleci/config.yml

@@ -476,6 +476,9 @@ workflows:
             - validate_documentation
             - wagon
             - rhel_wagon
+            - build_bundle
+            - unittests_py27
+            - unittests_py36
             # - integration_tests_505
             # - integration_tests_510
       - merge_docs:
@@ -499,7 +502,7 @@ workflows:
         filters:
           branches:
             only:
-              - 2.14.22-build
+              - 2.14.23-build
     jobs:
       - unittests_py27
       - unittests_py36
@@ -508,23 +511,23 @@ workflows:
       - wagon:
           filters:
             branches:
-              only: /(2.14.22-build|master)/
+              only: /(2.14.23-build|master)/
       - rhel_wagon:
           filters:
             branches:
-              only: /(2.14.22-build|master)/
+              only: /(2.14.23-build|master)/
       # - integration_tests_505:
       #     requires:
       #       - wagon
       #       - rhel_wagon
       #     filters:
       #       branches:
-      #         only: /(2.14.22-build|master)/
+      #         only: /(2.14.23-build|master)/
       # - integration_tests_510:
       #     requires:
       #       - wagon
       #       - rhel_wagon
       #       - integration_tests_505
       #     filters:
       #       branches:
-      #         only: /(2.14.22-build|master)/
+      #         only: /(2.14.23-build|master)/

CHANGELOG.txt

@@ -1,3 +1,5 @@
+2.14.23:
+    - Add tenant_id in openstack_config for backward compatibility.
 2.14.22:
     - Fix windows get password encoding python 3 compatibility.
 2.14.21:

constraints.txt

@@ -3,3 +3,4 @@ subprocess32==3.5.3
 pyrsistent===0.16.1
 cloudify-common>=5.1.0
 cryptography==3.2.1
+oslo.config==7.0.0

openstack_plugin_common/__init__.py

@@ -656,7 +656,9 @@ class OpenStackClient(object):
     AUTH_SETS = [
         COMMON | {'tenant_name'},
         COMMON | {'project_id', 'user_domain_name'},
+        COMMON | {'tenant_id', 'user_domain_name'},
         COMMON | {'project_id', 'project_name', 'user_domain_name'},
+        COMMON | {'tenant_id', 'project_name', 'user_domain_name'},
         COMMON | {'project_name', 'user_domain_name', 'project_domain_name'},
     ]
 

plugin.yaml

@@ -5,9 +5,9 @@
 plugins:
   openstack:
     executor: central_deployment_agent
-    source: https://github.com/cloudify-cosmo/cloudify-openstack-plugin/archive/2.14.22.zip
+    source: https://github.com/cloudify-cosmo/cloudify-openstack-plugin/archive/2.14.23.zip
     package_name: cloudify-openstack-plugin
-    package_version: '2.14.22'
+    package_version: '2.14.23'
 
 data_types:
   cloudify.openstack.types.custom_configuration:
@@ -92,6 +92,11 @@ data_types:
         description: Name of tenant.
         type: string
         required: false
+      tenant_id:
+        description: |
+          Id of tenant. Same as project_id, added for backwards compatibility.
+        type: string
+        required: false
       project_id:
         description: ID of project to operate on.
         type: string