Merge "Switch Nodepool to the new Rackspace Flex project"

playbooks/templates/clouds/nodepool_clouds.yaml.j2

@@ -48,16 +48,21 @@ clouds:
     volume_api_version: 2
   raxflex:
     regions:
+      - name: DFW3
+        values:
+          metrics:
+            statsd:
+              prefix: 'nodepool.task.raxflex-dfw3'
       - name: SJC3
         values:
           metrics:
             statsd:
               prefix: 'nodepool.task.raxflex-sjc3'
     auth:
-      auth_url: 'https://keystone.api.sjc3.rackspacecloud.com/v3'
-      project_id: '{{ nodepool_raxflex_project }}'
-      username: '{{ nodepool_raxflex_username }}'
-      password: '{{ nodepool_raxflex_key }}'
+      auth_url: 'https://keystone.api.{region_name}.rackspacecloud.com/v3'
+      project_id: '{{ nodepool_rax_flex_project }}'
+      username: '{{ nodepool_rax_flex_username }}'
+      password: '{{ nodepool_rax_flex_key }}'
       user_domain_name: rackspace_cloud_domain
   ovh:
     profile: ovh

playbooks/zuul/templates/group_vars/nodepool.yaml.j2

@@ -33,9 +33,9 @@ nodepool_rackspace_username: user
 nodepool_rackspace_key: apikey
 nodepool_rackspace_password: password
 nodepool_rackspace_project: project
-nodepool_raxflex_username: user
-nodepool_raxflex_key: apikey
-nodepool_raxflex_project: project
+nodepool_rax_flex_username: user
+nodepool_rax_flex_key: apikey
+nodepool_rax_flex_project: project
 nodepool_ovh_username: user
 nodepool_ovh_password: password
 nodepool_ovh_project: project