Add citynetwork openrc (apache#596)

The openrc should be updated for citynetwork cloud as well

Related-Bug: theopenlab/openlab#321

Author: wangxiyuan

playbooks/cloud-provider-openstack-acceptance-test-csi-cinder/run.yaml

@@ -1,9 +1,7 @@
 - hosts: all
   roles:
     - config-golang
-    - role: export-cloud-openrc
-      vars:
-        cloud_name: 'vexxhost'
+    - export-cloud-openrc
     - install-k8s
   become: yes
   tasks:

playbooks/cloud-provider-openstack-acceptance-test-e2e-conformance/run.yaml

@@ -1,9 +1,7 @@
 - hosts: all
   roles:
     - config-golang
-    - role: export-cloud-openrc
-      vars:
-        cloud_name: 'vexxhost'
+    - export-cloud-openrc
     - install-k8s
   become: yes
   tasks:

playbooks/cloud-provider-openstack-acceptance-test-k8s-cinder/run.yaml

@@ -2,9 +2,7 @@
   become: yes
   roles:
     - config-golang
-    - role: export-cloud-openrc
-      vars:
-        cloud_name: 'vexxhost'
+    - export-cloud-openrc
     - install-k8s
   tasks:
     - name: Run kubernetes cinder acceptance tests with cloud-provider-openstack

playbooks/cloud-provider-openstack-acceptance-test-lb-octavia/post.yaml

@@ -1,9 +1,7 @@
 - hosts: all
   become: yes
   roles:
-    - role: export-cloud-openrc
-      vars:
-        cloud_name: 'vexxhost'
+    - export-cloud-openrc
   tasks:
     - name: Clean up resources for lbass octavia acceptance tests
       shell:

playbooks/cloud-provider-openstack-acceptance-test-lb-octavia/run.yaml

@@ -2,9 +2,7 @@
   become: yes
   roles:
     - config-golang
-    - role: export-cloud-openrc
-      vars:
-        cloud_name: 'vexxhost'
+    - export-cloud-openrc
     - install-k8s
   tasks:
     - name: Run lbass octavia acceptance tests with cloud-provider-openstack

playbooks/cloud-provider-openstack-test/post.yaml

@@ -1,9 +1,7 @@
 - hosts: all
   become: yes
   roles:
-    - role: export-cloud-openrc
-      vars:
-        cloud_name: 'vexxhost'
+    - export-cloud-openrc
   tasks:
     - name: Clean up resources for kubernetes tests
       shell:

playbooks/cloud-provider-openstack-unittest/run.yaml

@@ -2,9 +2,7 @@
   become: yes
   roles:
     - config-golang
-    - role: export-cloud-openrc
-      vars:
-        cloud_name: 'vexxhost'
+    - export-cloud-openrc
   tasks:
     - name: Run unit tests with cloud-provider-openstack
       shell:

roles/export-cloud-openrc/tasks/main.yaml

@@ -91,6 +91,25 @@
   no_log: yes
   when: cloud_name == 'vexxhost'
 
+- name: Set fact for citynetwork openrc
+  set_fact:
+    openrc:
+      OS_AUTH_TYPE: '{{ citynetwork_credentials.auth_type }}'
+      OS_IDENTITY_API_VERSION: '{{ citynetwork_credentials.identity_api_version }}'
+      OS_VOLUME_API_VERSION: '{{ citynetwork_credentials.volume_api_version }}'
+      OS_NETWORK_API_VERSION: '{{ citynetwork_credentials.network_api_version }}'
+      OS_INTERFACE: '{{ citynetwork_credentials.interface }}'
+      OS_AUTH_URL: '{{ citynetwork_credentials.auth_url }}'
+      OS_PROJECT_NAME: '{{ citynetwork_credentials.project_name }}'
+      OS_PROJECT_DOMAIN_ID: '{{ citynetwork_credentials.project_domain_id }}'
+      OS_USERNAME: '{{ citynetwork_credentials.username }}'
+      OS_USER_DOMAIN_NAME: '{{ citynetwork_credentials.user_domain_name }}'
+      OS_PASSWORD: '{{ citynetwork_credentials.password }}'
+      OS_REGION_NAME: '{{ citynetwork_credentials.region_name }}'
+      OS_DOMAIN_NAME: '{{ citynetwork_credentials.user_domain_name }}'
+  no_log: yes
+  when: cloud_name == 'citynetwork'
+
 - name: Set fact for fusioncloud openrc
   set_fact:
     openrc:

zuul.d/jobs.yaml

@@ -533,6 +533,7 @@
       k8s_src_dir: '{{ ansible_user_dir }}/src/k8s.io/kubernetes'
       k8s_log_dir: '{{ ansible_user_dir }}/workspace/logs/kubernetes'
       kubectl: '{{ ansible_user_dir }}/src/k8s.io/kubernetes/cluster/kubectl.sh'
+      cloud_name: vexxhost
 
 - job:
     name: cloud-provider-openstack-unittest
@@ -2207,6 +2208,7 @@
       k8s_src_dir: '{{ ansible_user_dir }}/src/k8s.io/kubernetes'
       k8s_log_dir: '{{ ansible_user_dir }}/workspace/logs/kubernetes'
       kubectl: '{{ ansible_user_dir }}/src/k8s.io/kubernetes/cluster/kubectl.sh'
+      cloud_name: citynetwork
 
 - job:
     name: cloud-provider-openstack-unittest-citynetwork