nodepool config: remove builder template, fix base template

Change I9ca77927046e2b2e3cee9a642d0bc566e3871515 updated the
nodepool-builder_opendev group to deploy it's config into
/etc/openstack, but updated the wrong template.

The nodepool_builder_clouds.yaml.j2 file was an old, unreferenced copy
from left-over from Id1161bca8f23129202599dba299c288a6aa29212 when we
wanted to use nodepool to manage control-plane clouds.  That didn't
work out so well and I think we just missed cleaning it up with
I5e72928ec2dec37afa9c8567eff30eb6e9c04f1d.

Remove it now, and port the path changes into the correct config file.

Change-Id: I37af69b342b413df94435e59a7c16bb218183399

playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2

@@ -1,204 +0,0 @@
-#
-# Nodepool openstacksdk configuration
-#
-# This file is deployed to nodepool builder hosts as
-#
-#   {{ openstacksdk_config_dir }}/clouds.yaml
-#
-# and is used there to authenticate nodepool operations to clouds.
-# The naming should correspond that used in nodepool configuration
-# files.
-#
-
-cache:
-  expiration:
-    server: 5
-    port: 5
-    floating-ip: 5
-clouds:
-  rax:
-    profile: rackspace
-    regions:
-      - DFW
-      - ORD
-      - IAD
-    api_timeout: 60
-    auth:
-      username: '{{ nodepool_rackspace_username }}'
-      password: '{{ nodepool_rackspace_password }}'
-      project_id: '{{ nodepool_rackspace_project }}'
-    force_ipv4: true
-    identity_api_version: 2
-    volume_api_version: 1
-  rax-control-plane:
-    regions:
-      - DFW
-      - ORD
-      - IAD
-    profile: rackspace
-    auth:
-      username: '{{ clouds.openstackci_rax_username }}'
-      password: '{{ clouds.openstackci_rax_password }}'
-      project_id: '{{ clouds.openstackci_rax_project_id }}'
-    force_ipv4: true
-    identity_api_version: 2
-    volume_api_version: 1
-  ovh:
-    profile: ovh
-    # OVH has a weird new ipv6 setup that we can't handle properly
-    # for now ignore ipv6
-    force_ipv4: true
-    regions:
-      - BHS1
-      - GRA1
-    api_timeout: 60
-    auth:
-      username: '{{ nodepool_ovh_username }}'
-      password: '{{ nodepool_ovh_password }}'
-      project_name: '{{ nodepool_ovh_project }}'
-  inap:
-    profile: internap
-    api_timeout: 60
-    auth:
-      username: '{{ nodepool_internap_username }}'
-      password: '{{ nodepool_internap_password }}'
-      project_name: '{{ nodepool_internap_project }}'
-    regions:
-      - name: mtl01
-        values:
-          networks:
-            - name: inap-17304-WAN1101
-              routes_externally: True
-  vexxhost:
-    profile: vexxhost
-    regions:
-      - ca-ymq-1
-      - sjc1
-    api_timeout: 60
-    auth_type: password
-    auth:
-      username: '{{ nodepool_vexxhost_username }}'
-      password: '{{ nodepool_vexxhost_password }}'
-      project_name: '{{ nodepool_vexxhost_project }}'
-      project_domain_name: default
-      user_domain_name: default
-    image_format: 'raw'
-    force_ipv4: true
-  vexxhost-control-plane:
-    regions:
-      - ca-ymq-1
-      - sjc1
-    profile: vexxhost
-    auth:
-      username: '{{ clouds.openstackci_vexxhost_username }}'
-      password: '{{ clouds.openstackci_vexxhost_password }}'
-      project_name: '{{ clouds.openstackci_vexxhost_project_name }}'
-      project_domain_name: default
-      user_domain_name: default
-    image_format: 'raw'
-    force_ipv4: true
-  citycloud:
-    regions:
-      - Lon1
-      - Kna1
-      - La1
-      - Sto2
-    profile: citycloud
-    api_timeout: 60
-    auth:
-      # TODO(mordred) This auth_url entry is only needed until openstacksdk
-      # 0.18.2 or 0.19.0 is released.
-      auth_url: "https://{region_name}.citycloud.com:5000/v3/"
-      username: '{{ nodepool_citycloud_username }}'
-      password: '{{ nodepool_citycloud_password }}'
-      project_name: 'OpenStack CI Project'
-      project_domain_name: CCP_Domain_27611
-      user_domain_name: CCP_Domain_27611
-  linaro-london:
-    regions:
-      - London
-    identity_api_version: '3'
-    auth:
-      auth_url: https://uk.linaro.cloud:5000
-      username: '{{ nodepool_linaro_london_username }}'
-      password: '{{ nodepool_linaro_london_password }}'
-      project_name: '{{ nodepool_linaro_london_project }}'
-      project_domain_name: default
-      user_domain_name: default
-  linaro-us:
-    regions:
-      - RegionOne
-    identity_api_version: '3'
-    auth:
-      auth_url: https://us.linaro.cloud:5000
-      username: '{{ nodepool_linaro_us_username }}'
-      password: '{{ nodepool_linaro_us_password }}'
-      project_name: '{{ nodepool_linaro_us_project }}'
-      project_domain_name: default
-      user_domain_name: default
-  limestone:
-    regions:
-      - name: RegionOne
-        values:
-          networks:
-            - name: "Gateway Network"
-              routes_externally: false
-              routes_ipv6_externally: true
-              nat_destination: true
-    auth:
-      auth_url: https://osa.continuous.pw:5000
-      username: '{{ nodepool_limestone_username }}'
-      password: '{{ nodepool_limestone_password }}'
-      project_name: '{{ nodepool_limestone_project }}'
-      user_domain_name: default
-      project_domain_name: default
-    api_timeout: 60
-    identity_api_version: 3
-    floating_ip_source: None
-    cacert: '{{ openstacksdk_config_dir }}/limestone_cacert.pem'
-  packethost:
-    regions:
-      - name: us-west-1
-        values:
-          networks:
-            - name: openstackzuul-net
-              default_interface: True
-    auth:
-      auth_url: https://packet.platform9.net/keystone
-      username: '{{ nodepool_packethost_username }}'
-      password: '{{ nodepool_packethost_password }}'
-      project_name: '{{ nodepool_packethost_project }}'
-      user_domain_name: default
-      project_domain_name: default
-    identity_api_version: '3'
-    image_format: 'raw'
-  openedge:
-    regions:
-      - name: us-east
-        values:
-          networks:
-            - name: openstackzuul
-              routes_externally: false
-              routes_ipv6_externally: true
-              nat_destination: true
-    api_timeout: 60
-    auth:
-      auth_url: https://api.us-east.open-edge.io:5000/v3
-      username: '{{ nodepool_openedge_username }}'
-      password: '{{ nodepool_openedge_password }}'
-      project_name: '{{ nodepool_openedge_project }}'
-      project_domain_name: Default
-      user_domain_name: Default
-    identity_api_version: 3
-    floating_ip_source: None
-    image_format: 'qcow2'
-  airship-citycloud:
-    regions:
-      - Kna1
-    profile: citycloud
-    auth:
-      username: '{{ nodepool_airship_username }}'
-      password: '{{ nodepool_airship_password }}'
-      project_name: 'Airship_OpenDev_Test'
-      project_domain_name: CCP_Domain_34466
-      user_domain_name: CCP_Domain_34466

playbooks/templates/clouds/nodepool_clouds.yaml.j2

@@ -3,7 +3,7 @@
 #
 # This file is deployed to nodepool launcher and builder hosts as
 #
-#   ~nodepool/.config/openstack/config/clouds.yaml
+#   {{ openstacksdk_config_dir}}/clouds.yaml
 #
 # and is used there to authenticate nodepool operations to clouds.
 # This file only contains projects we are launching test nodes in, and
@@ -130,7 +130,7 @@ clouds:
     api_timeout: 60
     identity_api_version: 3
     floating_ip_source: None
-    cacert: /home/nodepool/.config/openstack/limestone_cacert.pem
+    cacert: {{ openstacksdk_config_dir }}/limestone_cacert.pem
   packethost:
     regions:
       - name: us-west-1