Add citynetowrk fra region (apache#602)

Author: wangxiyuan

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

@@ -111,6 +111,26 @@
   no_log: yes
   when: cloud_name == 'citynetwork'
 
+- name: Set fact for citynetwork fra openrc
+  set_fact:
+    openrc:
+      OS_AUTH_TYPE: '{{ citynetwork_credentials_fra.auth_type }}'
+      OS_IDENTITY_API_VERSION: '{{ citynetwork_credentials_fra.identity_api_version }}'
+      OS_VOLUME_API_VERSION: '{{ citynetwork_credentials_fra.volume_api_version }}'
+      OS_NETWORK_API_VERSION: '{{ citynetwork_credentials_fra.network_api_version }}'
+      OS_INTERFACE: '{{ citynetwork_credentials_fra.interface }}'
+      OS_AUTH_URL: '{{ citynetwork_credentials_fra.auth_url }}'
+      OS_PROJECT_ID: '{{ citynetwork_credentials_fra.project_id }}'
+      OS_PROJECT_NAME: '{{ citynetwork_credentials_fra.project_name }}'
+      OS_PROJECT_DOMAIN_NAME: '{{ citynetwork_credentials_fra.project_domain_name }}'
+      OS_USERNAME: '{{ citynetwork_credentials_fra.username }}'
+      OS_USER_DOMAIN_NAME: '{{ citynetwork_credentials_fra.user_domain_name }}'
+      OS_PASSWORD: '{{ citynetwork_credentials_fra.password }}'
+      OS_REGION_NAME: '{{ citynetwork_credentials_fra.region_name }}'
+      OS_DOMAIN_NAME: '{{ citynetwork_credentials_fra.user_domain_name }}'
+  no_log: yes
+  when: cloud_name == 'citynetwork_fra'
+
 - name: Set fact for fusioncloud openrc
   set_fact:
     openrc:

zuul.d/jobs.yaml

@@ -2200,15 +2200,15 @@
       Base job for all types of cloud-provider-openstack test jobs
     pre-run: playbooks/cloud-provider-openstack-test/pre.yaml
     post-run: playbooks/cloud-provider-openstack-test/post.yaml
-    nodeset: ubuntu-xenial-citynetwork
+    nodeset: ubuntu-xenial-citynetwork-fra
     secrets:
-      - citynetwork_credentials
+      - citynetwork_credentials_fra
     vars:
       k8s_os_provider_src_dir: '{{ ansible_user_dir }}/src/k8s.io/cloud-provider-openstack'
       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
+      cloud_name: citynetwork_fra
 
 - job:
     name: cloud-provider-openstack-unittest-citynetwork
@@ -2217,7 +2217,7 @@
       Run unit test of cloud-provider-openstack
     run: playbooks/cloud-provider-openstack-unittest/run.yaml
     secrets:
-      - citynetwork_credentials
+      - citynetwork_credentials_fra
 
 - job:
     name: cloud-provider-openstack-acceptance-test-k8s-cinder-citynetwork
@@ -2227,7 +2227,7 @@
     run: playbooks/cloud-provider-openstack-acceptance-test-k8s-cinder/run.yaml
     post-run: playbooks/cloud-provider-openstack-acceptance-test-k8s-cinder/post.yaml
     secrets:
-      - citynetwork_credentials
+      - citynetwork_credentials_fra
 
 - job:
     name: cloud-provider-openstack-acceptance-test-e2e-conformance-citynetwork
@@ -2239,7 +2239,7 @@
     run: playbooks/cloud-provider-openstack-acceptance-test-e2e-conformance/run.yaml
     post-run: playbooks/cloud-provider-openstack-acceptance-test-e2e-conformance/post.yaml
     secrets:
-      - citynetwork_credentials
+      - citynetwork_credentials_fra
       - gcp_account
       - dockerhub
 
@@ -2349,7 +2349,7 @@
     run: playbooks/cloud-provider-openstack-acceptance-test-csi-cinder/run.yaml
     post-run: playbooks/cloud-provider-openstack-acceptance-test-csi-cinder/post.yaml
     secrets:
-      - citynetwork_credentials
+      - citynetwork_credentials_fra
 
 - job:
     name: cloud-provider-openstack-acceptance-test-lb-octavia-citynetwork
@@ -2359,4 +2359,4 @@
     run: playbooks/cloud-provider-openstack-acceptance-test-lb-octavia/run.yaml
     post-run: playbooks/cloud-provider-openstack-acceptance-test-lb-octavia/post.yaml
     secrets:
-      - citynetwork_credentials
+      - citynetwork_credentials_fra

zuul.d/nodesets.yaml

@@ -30,6 +30,12 @@
       - name: ubuntu-xenial-citynetwork
         label: ubuntu-xenial-citynetwork
 
+- nodeset:
+    name: ubuntu-xenial-citynetwork-fra
+    nodes:
+      - name: ubuntu-xenial-fra
+        label: ubuntu-xenial-fra
+
 - nodeset:
     name: ubuntu-xenial-arm64
     nodes:

zuul.d/secrets.yaml

@@ -691,6 +691,103 @@
           2OZlyxKdvwystyBFz62t5FoDH1O1Tp8V5OKhU+6oQrQDwtD5SpeNTBGorBJ2NencFI0xR
           YowOlUFy1+n9s+N+PWpCG71Me9M72tiWw+wUbgGPkzyWrBUlyLCOz++aFsjknQ=
 
+- secret:
+    name: citynetwork_credentials_fra
+    data:
+      auth_type: password
+      identity_api_version: "3"
+      volume_api_version: "2"
+      network_api_version: "2.0"
+      interface: public
+      auth_url: !encrypted/pkcs1-oaep
+        - VtL0OoxYMdTU8QTMXDbR65VP26rHpPpQgm/CwUkNn+U2IQKsMoW9HDf1N9lVQxZMHdvvb
+          Ka/FN03pJis3m2uAROi3IvtXsvTLU66zYrTspn2izoHlup2YmcOYqO69ysewGPwsGCCYD
+          vTybTzIv8IoiqJrimi1i1XH5QrIozP5arma1GfiTMsUfb8xqYRZINE/wMv0aEf/d5oxm9
+          mz0RQCVHa11Qe8ayuZE87+wcFVpqCcJbcPnWRAukxX8gDG3y0ukTc2sQ0Q+ap0oFhuFEH
+          xuj9+kozMLtP2W5I5rqhnsl95k5WPGCbppd9NGwoeW5/za9kpStaV2zJMaOAJwrjNTFCN
+          uWJVqBoW89O1nFINHBjBvzVrp6JT74VeMDZWckJLW2kzg/rRBaxE+78C6wDX3zZQ4pd1g
+          TnmbNU14WBgXdBt8zeSC2+PSnhxTctF3xrDDjJAOZ+6zXjLicMlE8xj+2T34Ttm/geYBQ
+          U1IrETC3RumWBj2zUYTJqQjrN9aQvu2epEoE/84FKmuLMC0a4ghw+NfQE8/J/sWG34wNJ
+          Xgk9i9bqKeodIwO6xcv/t9UiPUQtEQ1ur73tsRSCKUt8xf2ixeTGdD5y9e14gXb2mnwsi
+          ZJ5l/FNJ3XBtp2icj4WU5ZqPDJRboZYuanLZlLL07QuXFtYcEWTc7QmF+RAO4k=
+      project_id: !encrypted/pkcs1-oaep
+        - kRwRPolMwRYP9+BGWfN21NrywOXgHns+mUNOcrBKLQiLqmK49cfHd70n5NMXs47VGPt2Q
+          s+3yo9o8LWX7w4orVaEXVzghjzMNMpOOZeQbM3Hfs0punh7CBNL5xaJpl/g7cjsHdTYro
+          iAPlc974R5V8CqjFmxyph6rd3TjrqeedfB4makQPWm2Cs7qjwrTrGYncM1ByZQXfJfNJf
+          l0ap/mhaqbS02bCzeuLpDkatxAnzxutoZh23QpxF/W8jRhZD1pnMZWmQwITGTRs+6CCub
+          Q39Wqcbh0033pZay9oua6/+SMpYydRKqBq83UYO8qDnPqFjxO1AUGGoKUkI2cevJYsy/q
+          navocPgMNw0mTuK5kDZH5ZyTDDNgpBidhXMCXpFDNj0z44ZrEy4QePqdZj+Dxd48M3Emw
+          TisPD2LXLUbyKzisFWrBAf8DYDAA53XwZDzXvHYSh/Td+eqsSVy9tvqxORJ44YMxknQiQ
+          nUg7kCGC99PpYVEaLMyjLPAcETUXdDLzfd2n5dKWNSGqOCcX/jMMoFM98LItI0jxQQUEb
+          mcbf84ZkVO1v64xjEShrfhUTrnYgvuY7YZc3EaP+PxVTQm/B+8XjTQDU6+4BXQgdB3h1d
+          ejKLpSbi0s3SIsgMM8dnGl0ZN4bUD3bD76E1EYY0P7ibEl9qjMrZ3bWnm35f0E=
+      project_name: !encrypted/pkcs1-oaep
+        - HJcy84cGG+84zxWyP9WFcsYDbVgRC1Ro4BF48H5YQqxyGBh//5FdQoHE5J6dAloy/Q4Q/
+          QjpHwnEbQQYGOqoy853Cb6xK5ghMFi1xCwqgOINjCStLE95ZgC1FtfomzWC2gEd/jjCXr
+          T+m+3cFwUSdM1RpZzdHpv7TJGGKpRneJ+BM45Y+Ip4MPp4bASDgN+y49Re0nevLC4ig/F
+          GTUjZfhSXfWtNjkJNuIfSXcEHbRyiIpuLbJ+V+GOzkj92QhXgaTr+imXyJaCX2CO+JM+T
+          CpIWBuAFmZ/hHs1p8ogFcb5fWchN8ZwmC4dMrTDXq6DBlPZPdKah+u/FDct+vpeDT9HVs
+          xa/tp637DH2k5l4pKNk9UlrZ5t3HhbbN6eVVcQTHE6XCvbHUEbMLYoRtaDiio1vdv4P0e
+          GU+O0xcJJBjBxQoke2Rxt0l1WA0wvOF14R4CYx5KEIABoUImJFBQ3lWisinK+aEnHC/Qu
+          sZdKzaSesHt380Mnxlo/lh2SA1Bqu7lNZ/La0KlZ8Vz0OFFW95OcRTQXt/SBnqnO6TAX5
+          Qvtk5lWope5xkrsk/Ak/MOprqsg35rfuhdczIdq/AexWvvh4D1if7NWsAUmHhNj3Xbo9E
+          XIH2HNSVnB+n95CH6mvYQKg5SZZEryQCYu8Zag+1f9HHkrqlcMhR9PN+/O5i2w=
+      project_domain_name: !encrypted/pkcs1-oaep
+        - K9mbAWFK1Cw+ySEaEbdxEFc6HL12zjMp4aJ8fICh+e5/Q5F3wnwdyLvSt7EF+G4hmOrOM
+          n+nGp9JHedsPjiIFzbB2iYK3J93WJGLwnSsyvFqyPukf8YeuBlbKFQog3rVKwKqaSmDew
+          8neDeuXnLQrAGSgCaFe0efs+nnh2dFxR1pRiXVhHDSdoas0K9rj9YkvDTB1j5hz2oc59x
+          F4AfO5OhEiSZStykoJhWR2u8FHLwDGIFCMZlQJtmj4syAK+pS0W8+DdDHNAKD34y9kLeN
+          69n7n6v2ceHKxCHWGl/ZCB8pL68uhN925+fnu8LWrd6tVcOxffdv4czy4nfh6FAlyt79Q
+          9HR2CQ+tvPl90KMoW6TUDq9kWov7Zar4OttUd/qan1DFL3/W4mfRPmsCTd1upVhDLp4Se
+          e2TzcPszt/Ovlz/+enp+QuUSEk1LHLJFlwIVaSZ1RxsWeFriu64U/ah2uE3jnjd5SEyUY
+          eIxXk5yLGYjd98LvRez1zrqCgJRm1/FvhMLQstOijHXwzVxvl2mk2yfEp9rCdDyg/xgF7
+          LFwXkAMRn9htZTKDLJ5dGXcOb7s3MQpT9E1wrJdE3BzzPDb/W/7mGtrErTyKypWOjVxco
+          e+Slzy6ldDT1Eo8ooiDn5c/IRN6xgsipGkM44BObCCx6Hgqnqpjyvsl5fsMG5U=
+      username: !encrypted/pkcs1-oaep
+        - jXilzHRmWz0mecZR/eAXkS1qW4I3BqTBnGE/tZW7RzarYP8wpsiGw1gsT2UQihd+78D4B
+          pYNC/SZVNxMiTGmtMPdgQ4vfuqTenrLSEAiF002GqovoIrydcGKRV23CWDBZjRWQYcafp
+          QIbWbOZqOIGNVyG9eoa9/xnylCP2+xk9OrLcGIsfrTHdj4ANAwKmRbxN/EAakZ+v7n3fS
+          rQOPiY/SL2J5dcWpB5MpPU0yBJAnF+HrSAIB3Pj3GxMaCWYR35ear48J+2klNPjNC3hyg
+          hk+XzC60ZSgXihezh+aw1ZxC5ezPHWSGbW/4SKAYtOE6LDfcgPa/jRdgbye3F/YnEwIbo
+          zu9D/exFmtM3VGdhAFCpIQo6kFDsbvIlt4wOKJsfYsUijm/b1kqBQHjAHWPMqPaEpSFp6
+          Af5PrSxAR88o9LYMyC5GDKqgk7jAaXEFvcxXTeOu8FQlSlzqFFjc5pozUu+jRNRE1f294
+          CuqSUtOBOs9lHW6+t59VlqL12I+PrCoMFIZr+OgAzWO+0dtYvqsMBH2ZBE0+EFpG4UyMA
+          pxQyQu/XOLL+NuW3ZTLajsq2cGlvbPV9HSgJfxcnwf7sg1yswm55tfim7J4tn8q/rGQ3n
+          vmOw5fmuE5VU0yh3Ebfr4jy4WIRnUZ0KK0/NrxU5hsBdt6eUoIKmX+VlElUzpE=
+      user_domain_name: !encrypted/pkcs1-oaep
+        - AzkB6pONDNG/NcsWUhZWUs5edhiCAUjSUa9VhtxY7mJnZdzAr5uYlZx8ilxLdOo0yL3zM
+          hLOANENbBFK7d8IBi2vULU110JOs9jT9IXN4hNm95ooyADdFn/ylUItbpXecZ2r1bN9ix
+          AxZ0MPgy0UMNR36A3jsBJWopR966UFIWwX481mCMRIxraeJ17pSGJQk9vUB5qfX4cdcWQ
+          TU8+PiqxByrH07cwYpncPqxaGbH1KjmxbWDBgEyFB657G8B2zdLu6xhls9l1uviFfKDMy
+          MutudaurG06mzwUfqQ59kLTBLAfBmjADsnCyWVhiInqNqHXQsEdLSlSlPXfWXkdGdFzPv
+          qmUO+Lu9b90uEDG+EX9/JK/L1FDVELHJ6D2J6mMUjPFuoIuomt+2AXHTtfP89nIN9Nh6j
+          HTAVF11ZKdQiLQRrz8Avmqeola9ODl3WkYB8+cn8M/zhDmyTmjf9Yj4AVvE1+Umz9bzHF
+          ulSe3rd+vfgIxrYClWKFfoEgcsch4w54HdnwQB0Nsjg6pO/kH98OFP3DSc7lX5uFTuvbm
+          dxhI7ur23p1VjBz8zR7h4gpSeJ+SkVkMLfJlGffjN2jSazRdu3sPoXKrojM38Awll9DRB
+          PMquPR61CECzPDRWAqKtTzujJz6rxF6fW5PEijW2CnKMfktPeRb3ATNOBbpTdo=
+      password: !encrypted/pkcs1-oaep
+        - biRDbjAP8irN6cZ3uGOSZUr7815IhIsmvg7BSyOmx+nq0Qs/LfRgmPBV6R3IcG4Uo5SS5
+          WNz99+j/NJmKLK35rAYd00XCKaJKa+hWEChn31odc3+g3tw8YBDMjyClHVwjwpEu7Dt7K
+          sSmHgiacxJdZ55zYmG5J/mEEOMdNivapdoQQoTnzdFdMknSN2+INk+0FTanvTdyac64e+
+          p+D2WbVRaYYEwtrqulGSInr8yhwA9YrdupjK9fzPZjBTpXgEwY/YgprESNq9GWD2fwEMz
+          pZiCe9WbOpXIi40EIoGX4j7KmQxcv1EBMQ30F2urIwAmHH0R8hir2Ot50x0cJEePKcYWL
+          PBOEdE+PMUFNc7INy86K1zFJVQdAtCzxKXJm7BWzsuxRJ4Y/6lXgZYP/yK3fUut44whqf
+          QGB7s+Wb2e1lFovTVQ7TFqj9nfydgI5t1H0JpT3FtbS7Ft/ZI0vjCLVGCUlh++O59mswK
+          KqTCdemwf9OB9D7s9wp0lCANGOAihNTgi7ZE4I38m7xrWlCiDLyEVCFMZc5LsNoCwwpKO
+          ZRauYE3JFyrzFSBg9sfbJwdoUr+bg6+K68LiZOH3NPtNs+mFbI91eI5V72wjIXkSxbXeD
+          oPvFNPNdPX7bcQevrv0KGdiTLfpSFl2fGRypwm5s066Fzq4Yq2+1+FPjvNIo24=
+      region_name: !encrypted/pkcs1-oaep
+        - kg80Qth6udjEzxFd2Dpu1MASyEL8tbRuxRhScClaZOz7EFmAob61OHEAEi2QzExBsUryp
+          FmM7FtPMyukYxe3iRJkeRQvwgw2IDIjNcZs7sHjJ0oOnmGM/uuxm00UQGjquz2pXpHa2O
+          xBIIjckCpKO9T93avlarjQhUWB8hIV9g/6LqWJzDpugCCUcTRinsa3vXBchkrMmD7HIp6
+          6mdEwWGlNiwOHnds3p56KFVyWaSChqA8jteQGrgxLezZOwYbZ2OEjxt8MUrL+F8unw3CR
+          m+dgnuTfOCPYF0SyjbQ9A+3XMry2/U+NJMuLAGC7tHIagoH7hu9qPBxX0q3RJg9UithMa
+          ST2oG+l3sVHHNAvvYhmAOH3fIm7nnueVnNtDMfhEX7fME1WIBjWC2J7N0RHMzZBtJ1dwQ
+          LI1SfRwcHkLsL2k2yPWV/PnVFOVSMOCe1Pf08rCNUPH18qbS5BMx38VrT35wODzgDJvJn
+          dMBWfsp5RDfQvGuc98TRAXkwra5zmC1XwMFRupRef4LboB1wZQCR9qh7XH7BK66xt7oz0
+          K0gFqYhe30f6YawNJ7GXpElg4dJypir4trz6A/XkSx448y6ZiukKfgS1jpavZVMXEOMmd
+          imIns3LmEwbRAXXWX7skbUhAUrbiCiPkWzXp7B/IWBaY0PSE9FnO/4YbQR9IRE=
+
 # Google cloud account info
 - secret:
     name: gcp_account