Merge pull request apache#148 from animationzl/use-role-export-openrc

Use role to export openrc in k8s cinder in-tree job
bzhaoopenstack · Apr 13, 2018 · ba6a52b · ba6a52b
2 parents 00bd9c0 + 4bb5a20
commit ba6a52b
Showing 1 changed file with 3 additions and 15 deletions.
diff --git a/playbooks/cloud-provider-openstack-acceptance-test-k8s-cinder/run.yaml b/playbooks/cloud-provider-openstack-acceptance-test-k8s-cinder/run.yaml
@@ -1,22 +1,10 @@
 - hosts: all
   become: yes
+  roles:
+    - export-vexxhost-openrc
   tasks:
     - shell:
         cmd: |
-          # use echo to delete extra spaces
-          export OS_AUTH_TYPE=$(echo '{{ vexxhost_credentials.auth_type }}')
-          export OS_IDENTITY_API_VERSION=$(echo '{{ vexxhost_credentials.identity_api_version }}')
-          export OS_VOLUME_API_VERSION=$(echo '{{ vexxhost_credentials.volume_api_version }}')
-          export OS_INTERFACE=$(echo '{{ vexxhost_credentials.interface }}')
-          export OS_AUTH_URL=$(echo '{{ vexxhost_credentials.auth_url }}')
-          export OS_PROJECT_ID=$(echo '{{ vexxhost_credentials.project_id }}')
-          export OS_PROJECT_NAME=$(echo '{{ vexxhost_credentials.project_name }}')
-          export OS_USER_DOMAIN_NAME=$(echo '{{ vexxhost_credentials.user_domain_name }}')
-          export OS_PROJECT_DOMAIN_ID=$(echo '{{ vexxhost_credentials.project_domain_id }}')
-          export OS_USERNAME=$(echo '{{ vexxhost_credentials.username }}')
-          export OS_PASSWORD=$(echo '{{ vexxhost_credentials.password }}')
-          export OS_REGION_NAME=$(echo '{{ vexxhost_credentials.region_name }}')
-
           set -x
           set -e
           set -o pipefail
@@ -108,4 +96,4 @@
           fi
         executable: /bin/bash
         chdir: '{{ zuul.project.src_dir }}'
-      environment: '{{ golang_env }}'
+      environment: '{{ golang_env | combine(vexxhost_openrc) }}'