Merge "Run cloud_launcher from zuul"

2020-05-07 15:31:29 +00:00 · 2020-05-07 15:31:29 +00:00 · 351264c919
commit 351264c919
parent 81716f2d96 1b126ef48a
10 changed files with 429 additions and 538 deletions
--- a/.zuul.yaml
+++ b/.zuul.yaml
@ -2209,7 +2209,6 @@
      - playbooks/service-bridge.yaml
      - playbooks/host_vars/bridge.openstack.org.yaml
      - playbooks/roles/logrotate/
-      - playbooks/roles/cloud-launcher-cron/
      - playbooks/roles/edit-secrets-script/
      - playbooks/roles/install-kubectl/
      - playbooks/roles/configure-kubectl/
@ -2618,6 +2617,20 @@
      - modules/
      - manifests/

+- job:
+    name: infra-prod-run-cloud-launcher
+    parent: infra-prod-service-base
+    description: Run cloud launcher playbook
+    vars:
+      playbook_name: run_cloud_launcher.yaml
+      infra_prod_ansible_forks: 1
+    dependencies:
+      - name: infra-prod-service-bridge
+        soft: true
+    files:
+      - playbooks/run_cloud_launcher.yaml
+      - playbooks/host_vars/bridge.openstack.org.yaml
+
 - job:
    name: system-config-goaccess-report
    description: |
@ -3042,6 +3055,7 @@
        - infra-prod-service-eavesdrop
        - infra-prod-remote-puppet-afs
        - infra-prod-remote-puppet-else
+        - infra-prod-run-cloud-launcher
    periodic:
      jobs:
        - developer-openstack-goaccess-report
@ -3078,6 +3092,11 @@
    opendev-prod-hourly:
      jobs:
        - infra-prod-install-ansible
+        - infra-prod-service-bridge:
+            dependencies:
+              - name: infra-prod-install-ansible
+                soft: true
+        - infra-prod-run-cloud-launcher
        - infra-prod-service-nodepool:
            dependencies:
              - name: infra-prod-install-ansible
--- a/playbooks/clouds_layouts.yml
+++ b/playbooks/clouds_layouts.yml
@ -1,404 +0,0 @@
-# This file is not a playbook, is a YAML file containing the resources layouts
-# for all the OpenStack Infra clouds.
-# It is meant to be passed as an argument to the the Ansible cloud launcher.
-profiles:
-  # Profile to launch AFS server for nodepool.
-  - name: openstackci-projects
-    projects:
-      - name: openstackci
-        description: OpenStack CI project
-        domain: default
-      - name: openstackzuul
-        description: OpenStack zuul project
-        domain: default
-
-  - name: openstackci-security
-    security_groups:
-      - name: default
-        description: Default security group
-    security_groups_rules:
-      - security_group: default
-        ethertype: IPv4
-        remote_group: default
-        state: absent
-      - security_group: default
-        ethertype: IPv6
-        remote_group: default
-        state: absent
-      - security_group: default
-        ethertype: IPv4
-        remote_ip_prefix: 0.0.0.0/0
-      - security_group: default
-        ethertype: IPv6
-        remote_ip_prefix: ::/0
-
-  - name: openstackci-keypairs
-    keypairs:
-      - name: infra-root-keys
-        public_key: |
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLsTZJ8hXTmzjKxYh/7V07mIy8xl2HL+9BaUlt6A6TMsL3LSvaVQNSgmXX5g0XfPWSCKmkZb1O28q49jQI2n7n7+sHkxn0dJDxj1N2oNrzNY7pDuPrdtCijczLFdievygXNhXNkQ2WIqHXDquN/jfLLJ9L0jxtxtsUMbiL2xxZEZcaf/K5MqyPhscpqiVNE1MjE4xgPbIbv8gCKtPpYIIrktOMb4JbV7rhOp5DcSP5gXtLhOF5fbBpZ+szqrTVUcBX0oTYr3iRfOje9WPsTZIk9vBfBtF416mCNxMSRc7KhSW727AnUu85hS0xiP0MRAf69KemG1OE1pW+LtDIAEYp mordred@camelot
-
-            ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvKYcWK1T7e3PKSFiqb03EYktnoxVASpPoq2rJw2JvhsP0JfS+lKrPzpUQv7L4JCuQMsPNtZ8LnwVEft39k58Kh8XMebSfaqPYAZS5zCNvQUQIhP9myOevBZf4CDeG+gmssqRFcWEwIllfDuIzKBQGVbomR+Y5QuW0HczIbkoOYI6iyf2jB6xg+bmzR2HViofNrSa62CYmHS6dO04Z95J27w6jGWpEOTBjEQvnb9sdBc4EzaBVmxCpa2EilB1u0th7/DvuH0yP4T+X8G8UjW1gZCTOVw06fqlBCST4KjdWw1F/AuOCT7048klbf4H+mCTaEcPzzu3Fkv8ckMWtS/Z9Q== jeblair@operational-necessity
-
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCnfoVhOTkrY7uoebL8PoHXb0Fg4jJqGCbwkxUdNUdheIdbnfyjuRG3iL8WZnzf7nzWnD+IGo6kkAo8BkNMK9L0P0Y+5IjI8NH49KU22tQ1umij4EIf5tzLh4gsqkJmy6QLrlbf10m6UF4rLFQhKzOd4b2H2K6KbP00CIymvbW3BwvNDODM4xRE2uao387qfvXZBUkB0PpRD+7fWPoN58gpFUm407Eba3WwX5PCD+1DD+RVBsG8maIDXerQ7lvFLoSuyMswv1TfkvCj0ZFhSFbfTd2ZysCu6eryFfeixR7NY9SNcp9YTqG6LrxGA7Ci6wz+hycFHXlDrlBgfFJDe5At clark@work
-
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3KnRBTH5QPpKjf4RWu4akzYt2gwp796cMkFl5vu8e7G/cHuh4979FeNJXMVP6F3rvZB+yXDHLCU5LBVLq0K+1GbAZT/hH38hpMOIvniwKIquvI6C/drkVPHO6YmVlapw/NI530PGnT/TAqCOycHBO5eF1bYsaqV1yZqvs9v7UZc6J4LukoLZwpmyWZ5P3ltAiiy8+FGq3SLCKWDMmv/Bjz4zTsaNbSWThJi0BydINjC1/0ze5Tyc/XgW1sDuxmmXJxgQp4EvLpronqb2hT60iA52kj8lrmoCIryRpgnbaRA7BrxKF8zIr0ZALHijxEUeWHhFJDIVRGUf0Ef0nrmBv fungi-openstack-2015
-
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHGuIVB/WxBd7k1R8x2FyfqT6KxRnoM7lE5RE8gvBk2r8cQeH5k1c+P5JrBvWpmqXv4satoivYOBiIb7JXEgIxx62YUx/JQ0J7k3w+av6h4iFe2OhOtEOjMF5F8/wO8a/95OeTZPzBZlUfA3hx754kuw3Q/aBKQUOHWxJOIedGyVHeJc7XiFj3RXIufFuUfng9+p4Z3q6d2/WpuKqs00WI0CLF17PkU4i8P9CraJR1dmsWW6zoxMT2G+DwMFI7ZMS3xrVBRuLwrLlbylVLW2kOJ0JeyjHnRh7X1kR7KG3cGOOjA1YQ0e+mXvremcO3/3o6Iop/N1AtqVuYCKlZc7Y9 slukjanov@mirantis.com
-
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDL9x1rhTVOEQEanrN+ecycaDtAbbh3kr41Rxx7galtLq0JwftjsZqv2Vwl9c8ARmm8HiHcLwDoaZB9gvs6teMScCB+5a1fcohiycJBl2olNFRzkGapDaTvl74aLXQBWaV84D8tUavEl26zcgwrv9WLUsy9pnHoo5K0BzbK7vT2g3VictCphveC2vdjCDeptocWvt4zxCmAY6O7QMKeUjKMlvuy+zCohJcR4BbDnw8EriFAmCeQZcAgfLTyeAvjo384NNIFWyhCwvbCLvpgTplMCp896DWLlXu9eaGUCNjT/sZM8zafAXbfc6OKYFQ5iANAiJktWwKaUaphJkbSVWT5 elizabeth@r2d2
-
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC3onVLOZiiGpQWTCIV0QwHmc3Jvqyl7UaJxIu7D49OQcLHqVZsozI9pSiCdTnWyAaM+E+5wD9yVcSTqMWqn2AZmZSwQ+Fh6KnCgPZ/o63+iCZPGL0RNk20M1iNh5dvdStDnn+j2fpeV/JONF0tBn07QvNL2eF4BwtbTG9Zhl186QNsXjXDghrSO3Etl6DSfcUhxyvMoA2LnclWWD5hLmiRhcBm+PIxveVsr4B+o0k1HV5SUOvJMWtbEC37AH5I818O4fNOob6CnOFaCsbA9oUDzB5rqxutPZb9SmNJpNoLqYqDgyppM0yeql0Kn97tUt7H4j5xHrWoGnJ4IXfuDc0AMmmy4fpcLGkNf7zcBftKS6iz/3AlOXjlp5WZvKxngJj9HIir2SE/qV4Lxw9936BzvAcQyw5+bEsLQJwi+LPZxEqLC6oklkX9dg/+1yBFHsz6mulA0b4Eq7VF9omRzrhhN4iPpU5KQYPRNz7yRYckXDxYnp2lz6yHgSYh2/lqMc+UqmCL9EAWcDw3jsgvJ6kH/YUVUojiRHD9QLqlhOusu1wrTfojjwF05mqkXKmH+LH8f8AJAlMdYg0c2WLlrcxnwCkLLxzU5cYmKcZ41LuLtQR3ik+EKjYzBXXyCEzFm6qQEbR2akpXyxvONgrf7pijrgNOi0GeatUt0bUQcAONYw== jhesketh@infra
-
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDTDia7zLp6NB/DdzhGW/4MDgaQ1yemfF+fGFctrSbBZzP2Aj3RUlBh4Mut3bTIqp/PKNMXVZQbvig5nqF3sB87ZPvmk+7WluFFcQN1RIZnvkYXjF64C+G5PkEZOQW9nqEeElSCV2lXgK98FPrGtK6HgQlYxH5RJa6cufRwYLXLsAwfKRcS3P5oRU2KDORNm6uBfUuX0TyPgtEjYsjCWcffoW+E8kvZbx1DKxF4+u0mWSdkg0P40aAY10mHACtJ4hnu7xNa5Z9Oru1rA1KWL5NHISgy9t5zC1/0jWfYi+tqToBgUCyB8stWgNpHh+QJrpS8CoCDzQLBar0ynnOxBfHH2+s9xJapQNi6ZOC3khWkoxUJn2Gs9FXqow3zGSmEuEKbbUvaGC58U4S0xFcZzF+sOzjRJtw66wE2pQN5Pj/Qw09w6gt05g4nxoxkRVCwMLdnyoIY1oFmywJX3xC1Utu2oCNfgZSn78rqVkE9e11LczPNGvYjl6xQo1r254E0w3QBgo+LaTK5FBRCAbJ76n0IBJ8SZe9foPWjKTGlbCevM6KO8lm58/0m0EfMf9457ZM9KhyXwYvnb+iR7huGC+pwgGemJ4D6vjeE9EUNGSq6igg+v+cl1DHOxVb0s0Tx2T6DMh3usB4C1uoNCR303cmzrNZ94KLXRICQArSClQI7OQ== nibz@hertz
-
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSR2NmJC8PSanHUpKJuaMmohG80COO2IPkE3Mxhr7US8P1B3p1c6lOrT6M1txRzBY8FlbxfOinGtutP+ADCB2taXfpO8UiaG9eOqojAT/PeP2Y2ov72rVMSWupLozUv2uAR5yyFVFHOjKPYGAa01aJtfzfJujSak8dM0ifFeFwgp/8RBGEfC7atq+45TdrfAURRcEgcOLiF5Aq6fprCOwpllnrH6VoId9YS7u/5xF2/zBjr9PuOP7jEgCaL/+FNqu7jgj87aG5jiZPlweb7GTLJON9H6eFpyfpoJE0sZ1yR9Q+e9FAqQIA44Zi748qKBlFKbLxzoC4mc0SbNUAleEL yolanda@infra
-
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCz1CW5E87v8o7O8B5fe7j1uaPCToRdaBukjH2HzQZ+DSGTIPjirLpp5ZXPuyNnmtRMzwld6mlHYlevVEwuZTNyQwS7ut5o0LjyW6yoEcvPq0xMEZLxaso5dZAtzNgf3FzbtaUYBnkhSwX7c24lf8wPGAl7TC3yO0dePQh2lXVdaBiGB9ybVeQr+kwJIxleUE4puuQ+ONJE2D+hHjoQ/huUMpb996pb/YzkjkAxqHguMid0c1taelyW8n17nEDoWvlV9Qqbo8cerhgURo1OBt2zENLjQQ0kOkPxJx4qx3652e0kbkr11y50r9BMs418mnJdWselMxkSqQNZ+XotoH5Dwn+3K2a6Wv4OX3Dqb9SF/JTD7lA/tIkNfxgsRlzfEQ01rK1+g7Je10EnDCLEzHpFjvZ5q4EEMcYqY+osLFpHAOWGLMx+3eY4pz/xEzRP/x3sjGU09uNOZ3oCWUfSkE4xebnnWtxwWZKyFmv3GHtaqJn2UvpAbODPEYyYcOS3XV3zd233W3C09YYnFUyZbGLXpD05Yet5fZfGTnveMRn5/9LZai+dBPwoMWUJdX4yPnGXgOG8zk0u1nWfcNJfYg+xajSUDiMKjDhlkuFK/GXNYuINe42s1TxzL7pJ4X4UhqLiopeJvPg/U5xdCV5pxVKf1MVenrGe2pfwf1Yr2WMv5w== rcarrillocruz@infra
-
-            ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILOjz+dkwRWTJcW9Gt3iGHSzRBsvVlTAK6G2oH3+0D41 iwienand+osinfra@redhat.com
-
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCdzEzB2KpNLTTFJGLCNMY53sja37PXFzHHdjWEGaZtaTcuCn/ufV9ql5yhS5/414u9swoHM71H00+nT4uSWcXc2tTRXYWslaiwU47DOtQsD//CvGgIFBNO1EinWhYa5uTSfxI+Z/x4PBu7XFq5wi/JCfJ+iHIWsvXn8U44r1csURcZU0GMPAVG1MO+s3p1W7daVqF9RR7UuwCECb3hdPN1N/M4s6myBiuRXCeDND98dKLf8b342hw+pWvQ3g/OCLcVlYPWT4fy1YGQT8hT+jA2XPfwCtu/k7HKAGH3E8UcnBtY/RI9ibciIFe+Ro7q8t+tp5SgjGLq1NnE4Yp5rpsh david@koala
-
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCuP0CZE8AYnbm8gxecCxKeRw0wHRyryd+FKmNNsdr0d3UvfCbqNzLigrqEBZsKpofi3M4qCWNpKRyfhnjPynLTQjP1vnX9AbL9UGoiHxScfvh3skntTYMs9ezJRd0rMJJZO76FPo8bJLDlwxAQl8m/nuj3HfYiO5hYE7P+a3rhsJh4nEfBb7xh+Q5yM0PWObkkBl6IRiBYjlcsXNZHgTA5kNuihUk5bHqAw54sHh05DhpgOITpTw4LFbh4Ew2NKq49dEb2xbTuAyAr2DHNOGgIwKEZpwtKZEIGEuiLbb4DQRsfivrvyOjnK2NFjQzGyNOHfsOldWHRQwUKUs8nrxKdXvqcrfMnSVaibeYK2TRL+6jd9kc5SIhWI3XLm7HbX7uXMD7/JQrkL25Rcs6nndDCH72DJLz+ynA/T5umMbNBQ9tybL5z73IOpfShRGjQYego22CxDOy7e/5OEMHNoksbFb1S02viM9O2puS7LDqqfT9JIbbPqCrbRi/zOXo0f4EXo6xKUAmd8qlV+6f/p57/qFihzQDaRFVlFEH3k7qwsw7PYGUTwkPaThe6xyZN6D5jqxCZU3aSYu+FGb0oYo+M5IxOm0Cb4NNsvvkRPxWtwSayfFGu6+m/+/RyA3GBcAMev7AuyKN+K2vGMsLagHOx4i+5ZAcUwGzLeXAENNum3w== pabelanger@redhat.com
-
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDDyXfFj44OTsJZnHbecbYrwA8zXuMiULb+o326maOh3wh5/6fk+MzivkUzJC2uZqAlKvBnNXsrb/07eV1gRjaIQBQJxaV9HQUwMNX7AkjkDzaMXVDjG/JOium90R23gVGMukzp9IamezUscAqAxVK+2C10k3tq8dZ/GeZfHl3NFGRHlIAXsJ/SIQoxJAEA0IQ/8Y50nR1Hp2mV2xsfxH9oZhLR/eiFdhJpNupdfw/oE9+vpCHS8SG88KGeLYbn+EhH6LSCD+6WNthF6oE7NANnScqn1Fl0ZpSd3RlRb+kDVKGqNxfB7EJTeimYvqaYmrTiTZTaTJua5Bj5yBTudqnBgdHCz3xMb2Nv2s2INNcJmP/CKpivYQ8AJs6cVlqRWnLJiNQQYCj+xAXBvY5T0Xq/qOhVifLiWZvZQOTHFWqFP9asZkrGa1mFWIaR9VPQY0FoYlUOT9t6J6TRbzktJIuP5AiOVoJLL6wjZuUMjghHfkYbqtyBqE4BbCY8YF3JSf8jx+9eWy+sD+dRwKXBCrGV0dNidioZR7ZJpBb6ye8wElebjPZizKhppsNpwtRxPfiAM52f55lXGD7IDpz9CZrOKUcV2uc3Rhl50u7T3psZfX7GysZvlnAH+Yr+UM+LPBAabXAfKlMnJp+SskLuOplTeQrvAwMluBmFnla8TnwnxQ== dmsimard@hostname
-
-            ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGmc5fbzMptjAb5D86zSH13ZYCbf3QuV1jk9hL0r1qHw frickler@os-infra-2017
-
-      - name: infra-root-keys-2018-06-15
-        public_key: |
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLsTZJ8hXTmzjKxYh/7V07mIy8xl2HL+9BaUlt6A6TMsL3LSvaVQNSgmXX5g0XfPWSCKmkZb1O28q49jQI2n7n7+sHkxn0dJDxj1N2oNrzNY7pDuPrdtCijczLFdievygXNhXNkQ2WIqHXDquN/jfLLJ9L0jxtxtsUMbiL2xxZEZcaf/K5MqyPhscpqiVNE1MjE4xgPbIbv8gCKtPpYIIrktOMb4JbV7rhOp5DcSP5gXtLhOF5fbBpZ+szqrTVUcBX0oTYr3iRfOje9WPsTZIk9vBfBtF416mCNxMSRc7KhSW727AnUu85hS0xiP0MRAf69KemG1OE1pW+LtDIAEYp mordred@camelot
-
-            ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvKYcWK1T7e3PKSFiqb03EYktnoxVASpPoq2rJw2JvhsP0JfS+lKrPzpUQv7L4JCuQMsPNtZ8LnwVEft39k58Kh8XMebSfaqPYAZS5zCNvQUQIhP9myOevBZf4CDeG+gmssqRFcWEwIllfDuIzKBQGVbomR+Y5QuW0HczIbkoOYI6iyf2jB6xg+bmzR2HViofNrSa62CYmHS6dO04Z95J27w6jGWpEOTBjEQvnb9sdBc4EzaBVmxCpa2EilB1u0th7/DvuH0yP4T+X8G8UjW1gZCTOVw06fqlBCST4KjdWw1F/AuOCT7048klbf4H+mCTaEcPzzu3Fkv8ckMWtS/Z9Q== jeblair@operational-necessity
-
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCnfoVhOTkrY7uoebL8PoHXb0Fg4jJqGCbwkxUdNUdheIdbnfyjuRG3iL8WZnzf7nzWnD+IGo6kkAo8BkNMK9L0P0Y+5IjI8NH49KU22tQ1umij4EIf5tzLh4gsqkJmy6QLrlbf10m6UF4rLFQhKzOd4b2H2K6KbP00CIymvbW3BwvNDODM4xRE2uao387qfvXZBUkB0PpRD+7fWPoN58gpFUm407Eba3WwX5PCD+1DD+RVBsG8maIDXerQ7lvFLoSuyMswv1TfkvCj0ZFhSFbfTd2ZysCu6eryFfeixR7NY9SNcp9YTqG6LrxGA7Ci6wz+hycFHXlDrlBgfFJDe5At clark@work
-
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3KnRBTH5QPpKjf4RWu4akzYt2gwp796cMkFl5vu8e7G/cHuh4979FeNJXMVP6F3rvZB+yXDHLCU5LBVLq0K+1GbAZT/hH38hpMOIvniwKIquvI6C/drkVPHO6YmVlapw/NI530PGnT/TAqCOycHBO5eF1bYsaqV1yZqvs9v7UZc6J4LukoLZwpmyWZ5P3ltAiiy8+FGq3SLCKWDMmv/Bjz4zTsaNbSWThJi0BydINjC1/0ze5Tyc/XgW1sDuxmmXJxgQp4EvLpronqb2hT60iA52kj8lrmoCIryRpgnbaRA7BrxKF8zIr0ZALHijxEUeWHhFJDIVRGUf0Ef0nrmBv fungi-openstack-2015
-
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC3onVLOZiiGpQWTCIV0QwHmc3Jvqyl7UaJxIu7D49OQcLHqVZsozI9pSiCdTnWyAaM+E+5wD9yVcSTqMWqn2AZmZSwQ+Fh6KnCgPZ/o63+iCZPGL0RNk20M1iNh5dvdStDnn+j2fpeV/JONF0tBn07QvNL2eF4BwtbTG9Zhl186QNsXjXDghrSO3Etl6DSfcUhxyvMoA2LnclWWD5hLmiRhcBm+PIxveVsr4B+o0k1HV5SUOvJMWtbEC37AH5I818O4fNOob6CnOFaCsbA9oUDzB5rqxutPZb9SmNJpNoLqYqDgyppM0yeql0Kn97tUt7H4j5xHrWoGnJ4IXfuDc0AMmmy4fpcLGkNf7zcBftKS6iz/3AlOXjlp5WZvKxngJj9HIir2SE/qV4Lxw9936BzvAcQyw5+bEsLQJwi+LPZxEqLC6oklkX9dg/+1yBFHsz6mulA0b4Eq7VF9omRzrhhN4iPpU5KQYPRNz7yRYckXDxYnp2lz6yHgSYh2/lqMc+UqmCL9EAWcDw3jsgvJ6kH/YUVUojiRHD9QLqlhOusu1wrTfojjwF05mqkXKmH+LH8f8AJAlMdYg0c2WLlrcxnwCkLLxzU5cYmKcZ41LuLtQR3ik+EKjYzBXXyCEzFm6qQEbR2akpXyxvONgrf7pijrgNOi0GeatUt0bUQcAONYw== jhesketh@infra
-
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSR2NmJC8PSanHUpKJuaMmohG80COO2IPkE3Mxhr7US8P1B3p1c6lOrT6M1txRzBY8FlbxfOinGtutP+ADCB2taXfpO8UiaG9eOqojAT/PeP2Y2ov72rVMSWupLozUv2uAR5yyFVFHOjKPYGAa01aJtfzfJujSak8dM0ifFeFwgp/8RBGEfC7atq+45TdrfAURRcEgcOLiF5Aq6fprCOwpllnrH6VoId9YS7u/5xF2/zBjr9PuOP7jEgCaL/+FNqu7jgj87aG5jiZPlweb7GTLJON9H6eFpyfpoJE0sZ1yR9Q+e9FAqQIA44Zi748qKBlFKbLxzoC4mc0SbNUAleEL yolanda@infra
-
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCz1CW5E87v8o7O8B5fe7j1uaPCToRdaBukjH2HzQZ+DSGTIPjirLpp5ZXPuyNnmtRMzwld6mlHYlevVEwuZTNyQwS7ut5o0LjyW6yoEcvPq0xMEZLxaso5dZAtzNgf3FzbtaUYBnkhSwX7c24lf8wPGAl7TC3yO0dePQh2lXVdaBiGB9ybVeQr+kwJIxleUE4puuQ+ONJE2D+hHjoQ/huUMpb996pb/YzkjkAxqHguMid0c1taelyW8n17nEDoWvlV9Qqbo8cerhgURo1OBt2zENLjQQ0kOkPxJx4qx3652e0kbkr11y50r9BMs418mnJdWselMxkSqQNZ+XotoH5Dwn+3K2a6Wv4OX3Dqb9SF/JTD7lA/tIkNfxgsRlzfEQ01rK1+g7Je10EnDCLEzHpFjvZ5q4EEMcYqY+osLFpHAOWGLMx+3eY4pz/xEzRP/x3sjGU09uNOZ3oCWUfSkE4xebnnWtxwWZKyFmv3GHtaqJn2UvpAbODPEYyYcOS3XV3zd233W3C09YYnFUyZbGLXpD05Yet5fZfGTnveMRn5/9LZai+dBPwoMWUJdX4yPnGXgOG8zk0u1nWfcNJfYg+xajSUDiMKjDhlkuFK/GXNYuINe42s1TxzL7pJ4X4UhqLiopeJvPg/U5xdCV5pxVKf1MVenrGe2pfwf1Yr2WMv5w== rcarrillocruz@infra
-
-            ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILOjz+dkwRWTJcW9Gt3iGHSzRBsvVlTAK6G2oH3+0D41 iwienand+osinfra@redhat.com
-
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtNtbgLw0dyRVnuwZz4oUcWTzEUtpO2V47t4ykijdH1hkEe7qkuusM5bD8pC4L3wDZP5U3lsIAvZ97LCQp+MNJz1j8cjXuAboqP5FC3TtCJR1WtCWmOBSO7sIvcsgwse/9KZN/TETOGA9no1oKS43Adi9bXrRFAKDAAM34IVt/UHNS51vxUhuGv+56yJmaki7CjxrGtXcB4hi+TCQAfKJPzhAMwcFQUyvXJkRei6NN6uYyHnVtLR3KXEkeTesZ2GQxmQ+1jmCMN1zUN2VLypmDqAvlKtuQW+3nY89q4HDwzCpuC1rscJgOuncdMahTMoKA3/dQtT4WuJIwLQa3tEEn shrews2018
-
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCuP0CZE8AYnbm8gxecCxKeRw0wHRyryd+FKmNNsdr0d3UvfCbqNzLigrqEBZsKpofi3M4qCWNpKRyfhnjPynLTQjP1vnX9AbL9UGoiHxScfvh3skntTYMs9ezJRd0rMJJZO76FPo8bJLDlwxAQl8m/nuj3HfYiO5hYE7P+a3rhsJh4nEfBb7xh+Q5yM0PWObkkBl6IRiBYjlcsXNZHgTA5kNuihUk5bHqAw54sHh05DhpgOITpTw4LFbh4Ew2NKq49dEb2xbTuAyAr2DHNOGgIwKEZpwtKZEIGEuiLbb4DQRsfivrvyOjnK2NFjQzGyNOHfsOldWHRQwUKUs8nrxKdXvqcrfMnSVaibeYK2TRL+6jd9kc5SIhWI3XLm7HbX7uXMD7/JQrkL25Rcs6nndDCH72DJLz+ynA/T5umMbNBQ9tybL5z73IOpfShRGjQYego22CxDOy7e/5OEMHNoksbFb1S02viM9O2puS7LDqqfT9JIbbPqCrbRi/zOXo0f4EXo6xKUAmd8qlV+6f/p57/qFihzQDaRFVlFEH3k7qwsw7PYGUTwkPaThe6xyZN6D5jqxCZU3aSYu+FGb0oYo+M5IxOm0Cb4NNsvvkRPxWtwSayfFGu6+m/+/RyA3GBcAMev7AuyKN+K2vGMsLagHOx4i+5ZAcUwGzLeXAENNum3w== pabelanger@redhat.com
-
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDDyXfFj44OTsJZnHbecbYrwA8zXuMiULb+o326maOh3wh5/6fk+MzivkUzJC2uZqAlKvBnNXsrb/07eV1gRjaIQBQJxaV9HQUwMNX7AkjkDzaMXVDjG/JOium90R23gVGMukzp9IamezUscAqAxVK+2C10k3tq8dZ/GeZfHl3NFGRHlIAXsJ/SIQoxJAEA0IQ/8Y50nR1Hp2mV2xsfxH9oZhLR/eiFdhJpNupdfw/oE9+vpCHS8SG88KGeLYbn+EhH6LSCD+6WNthF6oE7NANnScqn1Fl0ZpSd3RlRb+kDVKGqNxfB7EJTeimYvqaYmrTiTZTaTJua5Bj5yBTudqnBgdHCz3xMb2Nv2s2INNcJmP/CKpivYQ8AJs6cVlqRWnLJiNQQYCj+xAXBvY5T0Xq/qOhVifLiWZvZQOTHFWqFP9asZkrGa1mFWIaR9VPQY0FoYlUOT9t6J6TRbzktJIuP5AiOVoJLL6wjZuUMjghHfkYbqtyBqE4BbCY8YF3JSf8jx+9eWy+sD+dRwKXBCrGV0dNidioZR7ZJpBb6ye8wElebjPZizKhppsNpwtRxPfiAM52f55lXGD7IDpz9CZrOKUcV2uc3Rhl50u7T3psZfX7GysZvlnAH+Yr+UM+LPBAabXAfKlMnJp+SskLuOplTeQrvAwMluBmFnla8TnwnxQ== dmsimard@hostname
-
-            ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGmc5fbzMptjAb5D86zSH13ZYCbf3QuV1jk9hL0r1qHw frickler@os-infra-2017
-
-      - name: bridge-root-2014-09-15
-        public_key: |
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSLlN41ftgxkNeUi/kATYPwMPjJdMaSbgokSb9PSkRPZE7GeNai60BCfhu+ky8h5eMe70Bpwb7mQ7GAtHGXPNU1SRBPhMuVN9EYrQbt5KSiwuiTXtQHsWyYrSKtB+XGbl2PhpMQ/TPVtFoL5usxu/MYaakVkCEbt5IbPYNg88/NKPixicJuhi0qsd+l1X1zoc1+Fn87PlwMoIgfLIktwaL8hw9mzqr+pPcDIjCFQQWnjqJVEObOcMstBT20XwKj/ymiH+6p123nnlIHilACJzXhmIZIZO+EGkNF7KyXpcBSfv9efPI+VCE2TOv/scJFdEHtDFkl2kdUBYPC0wQ92rp puppet-remote-2014-09-15
-
-  - name: openstackci-flavors
-    flavors:
-      - name: nodepool
-        ram: 8192
-        vcpus: 8
-        disk: 80
-      - name: mirror
-        ram: 8192
-        vcpus: 4
-        disk: 250
-
-  - name: admin-roles
-    roles:
-      - name: Member
-
-  - name: openstackci-user-roles
-    user_roles:
-      - role: Member
-        user: openstackci
-        project: openstackci
-
-  - name: openstackzuul-user-roles
-    user_roles:
-      - role: Member
-        user: openstackzuul
-        project: openstackzuul
-
-  - name: openstackci-networking
-    networks:
-      - name: openstackci-network1
-    subnets:
-      - name: openstackci-subnet1
-        network_name: openstackci-network1
-        cidr: '10.0.1.0/24'
-
-  - name: openstackzuul-networking
-    networks:
-      - name: openstackzuul-network1
-    subnets:
-      - name: openstackzuul-subnet1
-        network_name: openstackzuul-network1
-        cidr: '10.0.1.0/24'
-
-clouds:
-  # ovh
-  - name: openstackci-ovh-bhs1
-    oscc_cloud: openstackci-ovh
-    region_name: BHS1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-  - name: openstackjenkins-ovh-bhs1
-    oscc_cloud: openstackjenkins-ovh
-    region_name: BHS1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-  - name: openstackci-ovh-gra1
-    oscc_cloud: openstackci-ovh
-    region_name: GRA1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-  - name: openstackjenkins-ovh-gra1
-    oscc_cloud: openstackjenkins-ovh
-    region_name: GRA1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-
-  # inap
-  - name: openstackci-inap-mtl01
-    oscc_cloud: openstackci-inap
-    region_name: mtl01
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-  - name: openstackjenkins-inap-mtl01
-    oscc_cloud: openstackjenkins-inap
-    region_name: mtl01
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-
-  # vexxhost
-  - name: openstackci-vexxhost-mtl1
-    oscc_cloud: openstackci-vexxhost
-    region_name: ca-ymq-1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-  - name: openstackjenkins-vexxhost-mtl1
-    oscc_cloud: openstackjenkins-vexxhost
-    region_name: ca-ymq-1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-  - name: openstackci-vexxhost-sjc1
-    oscc_cloud: openstackci-vexxhost
-    region_name: sjc1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-  - name: openstackjenkins-vexxhost-sjc1
-    oscc_cloud: openstackjenkins-vexxhost
-    region_name: sjc1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-
-  # rackspace
-  - name: openstackci-rax-dfw
-    oscc_cloud: openstackci-rax
-    region_name: DFW
-    profiles:
-      - openstackci-keypairs
-  - name: openstackjenkins-rax-dfw
-    oscc_cloud: openstackjenkins-rax
-    region_name: DFW
-    profiles:
-      - openstackci-keypairs
-  - name: openstackci-rax-ord
-    oscc_cloud: openstackci-rax
-    region_name: ORD
-    profiles:
-      - openstackci-keypairs
-  - name: openstackjenkins-rax-ord
-    oscc_cloud: openstackjenkins-rax
-    region_name: ORD
-    profiles:
-      - openstackci-keypairs
-  - name: openstackci-rax-iad
-    oscc_cloud: openstackci-rax
-    region_name: IAD
-    profiles:
-      - openstackci-keypairs
-  - name: openstackjenkins-rax-iad
-    oscc_cloud: openstackjenkins-rax
-    region_name: IAD
-    profiles:
-      - openstackci-keypairs
-
-  # Citycloud
-  - name: openstackci-citycloud-Lon1
-    oscc_cloud: openstackci-citycloud
-    region_name: Lon1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackci-networking
-    routers:
-      - name: openstackci-router1
-        network: ext-net
-        interfaces:
-          - openstackci-subnet1
-  - name: openstackzuul-citycloud-Lon1
-    oscc_cloud: openstackzuul-citycloud
-    region_name: Lon1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackzuul-networking
-    routers:
-      - name: openstackzuul-router1
-        network: ext-net
-        interfaces:
-          - openstackzuul-subnet1
-  - name: openstackci-citycloud-Kna1
-    oscc_cloud: openstackci-citycloud
-    region_name: Kna1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackci-networking
-    routers:
-      - name: openstackci-router1
-        network: ext-net
-        interfaces:
-          - openstackci-subnet1
-  - name: openstackzuul-citycloud-Kna1
-    oscc_cloud: openstackzuul-citycloud
-    region_name: Kna1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackzuul-networking
-    routers:
-      - name: openstackzuul-router1
-        network: ext-net
-        interfaces:
-          - openstackzuul-subnet1
-  - name: openstackci-citycloud-Sto2
-    oscc_cloud: openstackci-citycloud
-    region_name: Sto2
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackci-networking
-    routers:
-      - name: openstackci-router1
-        network: ext-net
-        interfaces:
-          - openstackci-subnet1
-  - name: openstackzuul-citycloud-Sto2
-    oscc_cloud: openstackzuul-citycloud
-    region_name: Sto2
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackzuul-networking
-    routers:
-      - name: openstackzuul-router1
-        network: ext-net
-        interfaces:
-          - openstackzuul-subnet1
-
-  # Linaro
-  - name: openstackci-linaro-london
-    oscc_cloud: openstackci-linaro-london
-    region_name: London
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-    images:
-      - name: ubuntu-xenial
-        download_image_url: https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-arm64-uefi1.img
-        download_image_dest: /tmp/ubuntu-xenial-aarch64-uefi.img
-        filename: /tmp/ubuntu-xenial-aarch64-uefi.img
-        properties:
-          hw_firmware_type: uefi
-          os_command_line: console=ttyAMA0
-          hw_disk_bus: scsi
-          hw_scsi_model: virtio-scsi
-  - name: openstackzuul-linaro-london
-    oscc_cloud: openstackzuul-linaro-london
-    region_name: London
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-
-  - name: openstackci-linaro-us
-    oscc_cloud: openstackci-linaro-us
-    region_name: RegionOne
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-
-  - name: openstackzuul-linaro-us
-    oscc_cloud: openstackzuul-linaro-us
-    region_name: RegionOne
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-
-  # Limestone
-  - name: openstackci-limestone
-    oscc_cloud: openstackci-limestone
-    region_name: RegionOne
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-  - name: openstackzuul-limestone
-    oscc_cloud: openstackzuul-limestone
-    region_name: RegionOne
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-
-  # Open Edge
-  - name: openstackci-openedge
-    oscc_cloud: openstackci-openedge
-    region_name: us-east
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-  - name: openstackzuul-openedge
-    oscc_cloud: openstackzuul-openedge
-    region_name: us-east
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-
-  - name: opendevci-airship-kna1
-    oscc_cloud: opendevci-airship
-    region_name: Kna1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackci-networking
-    routers:
-      - name: openstackci-router1
-        network: ext-net
-        interfaces:
-          - openstackci-subnet1
-  - name: opendevzuul-airship-kna1
-    oscc_cloud: opendevzuul-airship
-    region_name: Kna1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackci-networking
-    routers:
-      - name: openstackci-router1
-        network: ext-net
-        interfaces:
-          - openstackci-subnet1
--- a/playbooks/host_vars/bridge.openstack.org.yaml
+++ b/playbooks/host_vars/bridge.openstack.org.yaml
@ -2,3 +2,404 @@ bastion_key_exclusive: false
 kube_config_template: clouds/bridge_kube_config.yaml.j2
 extra_users:
  - zuul
+cloud_launcher_profiles:
+  # Profile to launch AFS server for nodepool.
+  - name: openstackci-projects
+    projects:
+      - name: openstackci
+        description: OpenStack CI project
+        domain: default
+      - name: openstackzuul
+        description: OpenStack zuul project
+        domain: default
+
+  - name: openstackci-security
+    security_groups:
+      - name: default
+        description: Default security group
+    security_groups_rules:
+      - security_group: default
+        ethertype: IPv4
+        remote_group: default
+        state: absent
+      - security_group: default
+        ethertype: IPv6
+        remote_group: default
+        state: absent
+      - security_group: default
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - security_group: default
+        ethertype: IPv6
+        remote_ip_prefix: ::/0
+
+  - name: openstackci-keypairs
+    keypairs:
+      - name: infra-root-keys
+        public_key: |
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLsTZJ8hXTmzjKxYh/7V07mIy8xl2HL+9BaUlt6A6TMsL3LSvaVQNSgmXX5g0XfPWSCKmkZb1O28q49jQI2n7n7+sHkxn0dJDxj1N2oNrzNY7pDuPrdtCijczLFdievygXNhXNkQ2WIqHXDquN/jfLLJ9L0jxtxtsUMbiL2xxZEZcaf/K5MqyPhscpqiVNE1MjE4xgPbIbv8gCKtPpYIIrktOMb4JbV7rhOp5DcSP5gXtLhOF5fbBpZ+szqrTVUcBX0oTYr3iRfOje9WPsTZIk9vBfBtF416mCNxMSRc7KhSW727AnUu85hS0xiP0MRAf69KemG1OE1pW+LtDIAEYp mordred@camelot
+
+            ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvKYcWK1T7e3PKSFiqb03EYktnoxVASpPoq2rJw2JvhsP0JfS+lKrPzpUQv7L4JCuQMsPNtZ8LnwVEft39k58Kh8XMebSfaqPYAZS5zCNvQUQIhP9myOevBZf4CDeG+gmssqRFcWEwIllfDuIzKBQGVbomR+Y5QuW0HczIbkoOYI6iyf2jB6xg+bmzR2HViofNrSa62CYmHS6dO04Z95J27w6jGWpEOTBjEQvnb9sdBc4EzaBVmxCpa2EilB1u0th7/DvuH0yP4T+X8G8UjW1gZCTOVw06fqlBCST4KjdWw1F/AuOCT7048klbf4H+mCTaEcPzzu3Fkv8ckMWtS/Z9Q== jeblair@operational-necessity
+
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCnfoVhOTkrY7uoebL8PoHXb0Fg4jJqGCbwkxUdNUdheIdbnfyjuRG3iL8WZnzf7nzWnD+IGo6kkAo8BkNMK9L0P0Y+5IjI8NH49KU22tQ1umij4EIf5tzLh4gsqkJmy6QLrlbf10m6UF4rLFQhKzOd4b2H2K6KbP00CIymvbW3BwvNDODM4xRE2uao387qfvXZBUkB0PpRD+7fWPoN58gpFUm407Eba3WwX5PCD+1DD+RVBsG8maIDXerQ7lvFLoSuyMswv1TfkvCj0ZFhSFbfTd2ZysCu6eryFfeixR7NY9SNcp9YTqG6LrxGA7Ci6wz+hycFHXlDrlBgfFJDe5At clark@work
+
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3KnRBTH5QPpKjf4RWu4akzYt2gwp796cMkFl5vu8e7G/cHuh4979FeNJXMVP6F3rvZB+yXDHLCU5LBVLq0K+1GbAZT/hH38hpMOIvniwKIquvI6C/drkVPHO6YmVlapw/NI530PGnT/TAqCOycHBO5eF1bYsaqV1yZqvs9v7UZc6J4LukoLZwpmyWZ5P3ltAiiy8+FGq3SLCKWDMmv/Bjz4zTsaNbSWThJi0BydINjC1/0ze5Tyc/XgW1sDuxmmXJxgQp4EvLpronqb2hT60iA52kj8lrmoCIryRpgnbaRA7BrxKF8zIr0ZALHijxEUeWHhFJDIVRGUf0Ef0nrmBv fungi-openstack-2015
+
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHGuIVB/WxBd7k1R8x2FyfqT6KxRnoM7lE5RE8gvBk2r8cQeH5k1c+P5JrBvWpmqXv4satoivYOBiIb7JXEgIxx62YUx/JQ0J7k3w+av6h4iFe2OhOtEOjMF5F8/wO8a/95OeTZPzBZlUfA3hx754kuw3Q/aBKQUOHWxJOIedGyVHeJc7XiFj3RXIufFuUfng9+p4Z3q6d2/WpuKqs00WI0CLF17PkU4i8P9CraJR1dmsWW6zoxMT2G+DwMFI7ZMS3xrVBRuLwrLlbylVLW2kOJ0JeyjHnRh7X1kR7KG3cGOOjA1YQ0e+mXvremcO3/3o6Iop/N1AtqVuYCKlZc7Y9 slukjanov@mirantis.com
+
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDL9x1rhTVOEQEanrN+ecycaDtAbbh3kr41Rxx7galtLq0JwftjsZqv2Vwl9c8ARmm8HiHcLwDoaZB9gvs6teMScCB+5a1fcohiycJBl2olNFRzkGapDaTvl74aLXQBWaV84D8tUavEl26zcgwrv9WLUsy9pnHoo5K0BzbK7vT2g3VictCphveC2vdjCDeptocWvt4zxCmAY6O7QMKeUjKMlvuy+zCohJcR4BbDnw8EriFAmCeQZcAgfLTyeAvjo384NNIFWyhCwvbCLvpgTplMCp896DWLlXu9eaGUCNjT/sZM8zafAXbfc6OKYFQ5iANAiJktWwKaUaphJkbSVWT5 elizabeth@r2d2
+
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC3onVLOZiiGpQWTCIV0QwHmc3Jvqyl7UaJxIu7D49OQcLHqVZsozI9pSiCdTnWyAaM+E+5wD9yVcSTqMWqn2AZmZSwQ+Fh6KnCgPZ/o63+iCZPGL0RNk20M1iNh5dvdStDnn+j2fpeV/JONF0tBn07QvNL2eF4BwtbTG9Zhl186QNsXjXDghrSO3Etl6DSfcUhxyvMoA2LnclWWD5hLmiRhcBm+PIxveVsr4B+o0k1HV5SUOvJMWtbEC37AH5I818O4fNOob6CnOFaCsbA9oUDzB5rqxutPZb9SmNJpNoLqYqDgyppM0yeql0Kn97tUt7H4j5xHrWoGnJ4IXfuDc0AMmmy4fpcLGkNf7zcBftKS6iz/3AlOXjlp5WZvKxngJj9HIir2SE/qV4Lxw9936BzvAcQyw5+bEsLQJwi+LPZxEqLC6oklkX9dg/+1yBFHsz6mulA0b4Eq7VF9omRzrhhN4iPpU5KQYPRNz7yRYckXDxYnp2lz6yHgSYh2/lqMc+UqmCL9EAWcDw3jsgvJ6kH/YUVUojiRHD9QLqlhOusu1wrTfojjwF05mqkXKmH+LH8f8AJAlMdYg0c2WLlrcxnwCkLLxzU5cYmKcZ41LuLtQR3ik+EKjYzBXXyCEzFm6qQEbR2akpXyxvONgrf7pijrgNOi0GeatUt0bUQcAONYw== jhesketh@infra
+
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDTDia7zLp6NB/DdzhGW/4MDgaQ1yemfF+fGFctrSbBZzP2Aj3RUlBh4Mut3bTIqp/PKNMXVZQbvig5nqF3sB87ZPvmk+7WluFFcQN1RIZnvkYXjF64C+G5PkEZOQW9nqEeElSCV2lXgK98FPrGtK6HgQlYxH5RJa6cufRwYLXLsAwfKRcS3P5oRU2KDORNm6uBfUuX0TyPgtEjYsjCWcffoW+E8kvZbx1DKxF4+u0mWSdkg0P40aAY10mHACtJ4hnu7xNa5Z9Oru1rA1KWL5NHISgy9t5zC1/0jWfYi+tqToBgUCyB8stWgNpHh+QJrpS8CoCDzQLBar0ynnOxBfHH2+s9xJapQNi6ZOC3khWkoxUJn2Gs9FXqow3zGSmEuEKbbUvaGC58U4S0xFcZzF+sOzjRJtw66wE2pQN5Pj/Qw09w6gt05g4nxoxkRVCwMLdnyoIY1oFmywJX3xC1Utu2oCNfgZSn78rqVkE9e11LczPNGvYjl6xQo1r254E0w3QBgo+LaTK5FBRCAbJ76n0IBJ8SZe9foPWjKTGlbCevM6KO8lm58/0m0EfMf9457ZM9KhyXwYvnb+iR7huGC+pwgGemJ4D6vjeE9EUNGSq6igg+v+cl1DHOxVb0s0Tx2T6DMh3usB4C1uoNCR303cmzrNZ94KLXRICQArSClQI7OQ== nibz@hertz
+
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSR2NmJC8PSanHUpKJuaMmohG80COO2IPkE3Mxhr7US8P1B3p1c6lOrT6M1txRzBY8FlbxfOinGtutP+ADCB2taXfpO8UiaG9eOqojAT/PeP2Y2ov72rVMSWupLozUv2uAR5yyFVFHOjKPYGAa01aJtfzfJujSak8dM0ifFeFwgp/8RBGEfC7atq+45TdrfAURRcEgcOLiF5Aq6fprCOwpllnrH6VoId9YS7u/5xF2/zBjr9PuOP7jEgCaL/+FNqu7jgj87aG5jiZPlweb7GTLJON9H6eFpyfpoJE0sZ1yR9Q+e9FAqQIA44Zi748qKBlFKbLxzoC4mc0SbNUAleEL yolanda@infra
+
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCz1CW5E87v8o7O8B5fe7j1uaPCToRdaBukjH2HzQZ+DSGTIPjirLpp5ZXPuyNnmtRMzwld6mlHYlevVEwuZTNyQwS7ut5o0LjyW6yoEcvPq0xMEZLxaso5dZAtzNgf3FzbtaUYBnkhSwX7c24lf8wPGAl7TC3yO0dePQh2lXVdaBiGB9ybVeQr+kwJIxleUE4puuQ+ONJE2D+hHjoQ/huUMpb996pb/YzkjkAxqHguMid0c1taelyW8n17nEDoWvlV9Qqbo8cerhgURo1OBt2zENLjQQ0kOkPxJx4qx3652e0kbkr11y50r9BMs418mnJdWselMxkSqQNZ+XotoH5Dwn+3K2a6Wv4OX3Dqb9SF/JTD7lA/tIkNfxgsRlzfEQ01rK1+g7Je10EnDCLEzHpFjvZ5q4EEMcYqY+osLFpHAOWGLMx+3eY4pz/xEzRP/x3sjGU09uNOZ3oCWUfSkE4xebnnWtxwWZKyFmv3GHtaqJn2UvpAbODPEYyYcOS3XV3zd233W3C09YYnFUyZbGLXpD05Yet5fZfGTnveMRn5/9LZai+dBPwoMWUJdX4yPnGXgOG8zk0u1nWfcNJfYg+xajSUDiMKjDhlkuFK/GXNYuINe42s1TxzL7pJ4X4UhqLiopeJvPg/U5xdCV5pxVKf1MVenrGe2pfwf1Yr2WMv5w== rcarrillocruz@infra
+
+            ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILOjz+dkwRWTJcW9Gt3iGHSzRBsvVlTAK6G2oH3+0D41 iwienand+osinfra@redhat.com
+
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCdzEzB2KpNLTTFJGLCNMY53sja37PXFzHHdjWEGaZtaTcuCn/ufV9ql5yhS5/414u9swoHM71H00+nT4uSWcXc2tTRXYWslaiwU47DOtQsD//CvGgIFBNO1EinWhYa5uTSfxI+Z/x4PBu7XFq5wi/JCfJ+iHIWsvXn8U44r1csURcZU0GMPAVG1MO+s3p1W7daVqF9RR7UuwCECb3hdPN1N/M4s6myBiuRXCeDND98dKLf8b342hw+pWvQ3g/OCLcVlYPWT4fy1YGQT8hT+jA2XPfwCtu/k7HKAGH3E8UcnBtY/RI9ibciIFe+Ro7q8t+tp5SgjGLq1NnE4Yp5rpsh david@koala
+
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCuP0CZE8AYnbm8gxecCxKeRw0wHRyryd+FKmNNsdr0d3UvfCbqNzLigrqEBZsKpofi3M4qCWNpKRyfhnjPynLTQjP1vnX9AbL9UGoiHxScfvh3skntTYMs9ezJRd0rMJJZO76FPo8bJLDlwxAQl8m/nuj3HfYiO5hYE7P+a3rhsJh4nEfBb7xh+Q5yM0PWObkkBl6IRiBYjlcsXNZHgTA5kNuihUk5bHqAw54sHh05DhpgOITpTw4LFbh4Ew2NKq49dEb2xbTuAyAr2DHNOGgIwKEZpwtKZEIGEuiLbb4DQRsfivrvyOjnK2NFjQzGyNOHfsOldWHRQwUKUs8nrxKdXvqcrfMnSVaibeYK2TRL+6jd9kc5SIhWI3XLm7HbX7uXMD7/JQrkL25Rcs6nndDCH72DJLz+ynA/T5umMbNBQ9tybL5z73IOpfShRGjQYego22CxDOy7e/5OEMHNoksbFb1S02viM9O2puS7LDqqfT9JIbbPqCrbRi/zOXo0f4EXo6xKUAmd8qlV+6f/p57/qFihzQDaRFVlFEH3k7qwsw7PYGUTwkPaThe6xyZN6D5jqxCZU3aSYu+FGb0oYo+M5IxOm0Cb4NNsvvkRPxWtwSayfFGu6+m/+/RyA3GBcAMev7AuyKN+K2vGMsLagHOx4i+5ZAcUwGzLeXAENNum3w== pabelanger@redhat.com
+
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDDyXfFj44OTsJZnHbecbYrwA8zXuMiULb+o326maOh3wh5/6fk+MzivkUzJC2uZqAlKvBnNXsrb/07eV1gRjaIQBQJxaV9HQUwMNX7AkjkDzaMXVDjG/JOium90R23gVGMukzp9IamezUscAqAxVK+2C10k3tq8dZ/GeZfHl3NFGRHlIAXsJ/SIQoxJAEA0IQ/8Y50nR1Hp2mV2xsfxH9oZhLR/eiFdhJpNupdfw/oE9+vpCHS8SG88KGeLYbn+EhH6LSCD+6WNthF6oE7NANnScqn1Fl0ZpSd3RlRb+kDVKGqNxfB7EJTeimYvqaYmrTiTZTaTJua5Bj5yBTudqnBgdHCz3xMb2Nv2s2INNcJmP/CKpivYQ8AJs6cVlqRWnLJiNQQYCj+xAXBvY5T0Xq/qOhVifLiWZvZQOTHFWqFP9asZkrGa1mFWIaR9VPQY0FoYlUOT9t6J6TRbzktJIuP5AiOVoJLL6wjZuUMjghHfkYbqtyBqE4BbCY8YF3JSf8jx+9eWy+sD+dRwKXBCrGV0dNidioZR7ZJpBb6ye8wElebjPZizKhppsNpwtRxPfiAM52f55lXGD7IDpz9CZrOKUcV2uc3Rhl50u7T3psZfX7GysZvlnAH+Yr+UM+LPBAabXAfKlMnJp+SskLuOplTeQrvAwMluBmFnla8TnwnxQ== dmsimard@hostname
+
+            ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGmc5fbzMptjAb5D86zSH13ZYCbf3QuV1jk9hL0r1qHw frickler@os-infra-2017
+
+      - name: infra-root-keys-2018-06-15
+        public_key: |
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLsTZJ8hXTmzjKxYh/7V07mIy8xl2HL+9BaUlt6A6TMsL3LSvaVQNSgmXX5g0XfPWSCKmkZb1O28q49jQI2n7n7+sHkxn0dJDxj1N2oNrzNY7pDuPrdtCijczLFdievygXNhXNkQ2WIqHXDquN/jfLLJ9L0jxtxtsUMbiL2xxZEZcaf/K5MqyPhscpqiVNE1MjE4xgPbIbv8gCKtPpYIIrktOMb4JbV7rhOp5DcSP5gXtLhOF5fbBpZ+szqrTVUcBX0oTYr3iRfOje9WPsTZIk9vBfBtF416mCNxMSRc7KhSW727AnUu85hS0xiP0MRAf69KemG1OE1pW+LtDIAEYp mordred@camelot
+
+            ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvKYcWK1T7e3PKSFiqb03EYktnoxVASpPoq2rJw2JvhsP0JfS+lKrPzpUQv7L4JCuQMsPNtZ8LnwVEft39k58Kh8XMebSfaqPYAZS5zCNvQUQIhP9myOevBZf4CDeG+gmssqRFcWEwIllfDuIzKBQGVbomR+Y5QuW0HczIbkoOYI6iyf2jB6xg+bmzR2HViofNrSa62CYmHS6dO04Z95J27w6jGWpEOTBjEQvnb9sdBc4EzaBVmxCpa2EilB1u0th7/DvuH0yP4T+X8G8UjW1gZCTOVw06fqlBCST4KjdWw1F/AuOCT7048klbf4H+mCTaEcPzzu3Fkv8ckMWtS/Z9Q== jeblair@operational-necessity
+
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCnfoVhOTkrY7uoebL8PoHXb0Fg4jJqGCbwkxUdNUdheIdbnfyjuRG3iL8WZnzf7nzWnD+IGo6kkAo8BkNMK9L0P0Y+5IjI8NH49KU22tQ1umij4EIf5tzLh4gsqkJmy6QLrlbf10m6UF4rLFQhKzOd4b2H2K6KbP00CIymvbW3BwvNDODM4xRE2uao387qfvXZBUkB0PpRD+7fWPoN58gpFUm407Eba3WwX5PCD+1DD+RVBsG8maIDXerQ7lvFLoSuyMswv1TfkvCj0ZFhSFbfTd2ZysCu6eryFfeixR7NY9SNcp9YTqG6LrxGA7Ci6wz+hycFHXlDrlBgfFJDe5At clark@work
+
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3KnRBTH5QPpKjf4RWu4akzYt2gwp796cMkFl5vu8e7G/cHuh4979FeNJXMVP6F3rvZB+yXDHLCU5LBVLq0K+1GbAZT/hH38hpMOIvniwKIquvI6C/drkVPHO6YmVlapw/NI530PGnT/TAqCOycHBO5eF1bYsaqV1yZqvs9v7UZc6J4LukoLZwpmyWZ5P3ltAiiy8+FGq3SLCKWDMmv/Bjz4zTsaNbSWThJi0BydINjC1/0ze5Tyc/XgW1sDuxmmXJxgQp4EvLpronqb2hT60iA52kj8lrmoCIryRpgnbaRA7BrxKF8zIr0ZALHijxEUeWHhFJDIVRGUf0Ef0nrmBv fungi-openstack-2015
+
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC3onVLOZiiGpQWTCIV0QwHmc3Jvqyl7UaJxIu7D49OQcLHqVZsozI9pSiCdTnWyAaM+E+5wD9yVcSTqMWqn2AZmZSwQ+Fh6KnCgPZ/o63+iCZPGL0RNk20M1iNh5dvdStDnn+j2fpeV/JONF0tBn07QvNL2eF4BwtbTG9Zhl186QNsXjXDghrSO3Etl6DSfcUhxyvMoA2LnclWWD5hLmiRhcBm+PIxveVsr4B+o0k1HV5SUOvJMWtbEC37AH5I818O4fNOob6CnOFaCsbA9oUDzB5rqxutPZb9SmNJpNoLqYqDgyppM0yeql0Kn97tUt7H4j5xHrWoGnJ4IXfuDc0AMmmy4fpcLGkNf7zcBftKS6iz/3AlOXjlp5WZvKxngJj9HIir2SE/qV4Lxw9936BzvAcQyw5+bEsLQJwi+LPZxEqLC6oklkX9dg/+1yBFHsz6mulA0b4Eq7VF9omRzrhhN4iPpU5KQYPRNz7yRYckXDxYnp2lz6yHgSYh2/lqMc+UqmCL9EAWcDw3jsgvJ6kH/YUVUojiRHD9QLqlhOusu1wrTfojjwF05mqkXKmH+LH8f8AJAlMdYg0c2WLlrcxnwCkLLxzU5cYmKcZ41LuLtQR3ik+EKjYzBXXyCEzFm6qQEbR2akpXyxvONgrf7pijrgNOi0GeatUt0bUQcAONYw== jhesketh@infra
+
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSR2NmJC8PSanHUpKJuaMmohG80COO2IPkE3Mxhr7US8P1B3p1c6lOrT6M1txRzBY8FlbxfOinGtutP+ADCB2taXfpO8UiaG9eOqojAT/PeP2Y2ov72rVMSWupLozUv2uAR5yyFVFHOjKPYGAa01aJtfzfJujSak8dM0ifFeFwgp/8RBGEfC7atq+45TdrfAURRcEgcOLiF5Aq6fprCOwpllnrH6VoId9YS7u/5xF2/zBjr9PuOP7jEgCaL/+FNqu7jgj87aG5jiZPlweb7GTLJON9H6eFpyfpoJE0sZ1yR9Q+e9FAqQIA44Zi748qKBlFKbLxzoC4mc0SbNUAleEL yolanda@infra
+
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCz1CW5E87v8o7O8B5fe7j1uaPCToRdaBukjH2HzQZ+DSGTIPjirLpp5ZXPuyNnmtRMzwld6mlHYlevVEwuZTNyQwS7ut5o0LjyW6yoEcvPq0xMEZLxaso5dZAtzNgf3FzbtaUYBnkhSwX7c24lf8wPGAl7TC3yO0dePQh2lXVdaBiGB9ybVeQr+kwJIxleUE4puuQ+ONJE2D+hHjoQ/huUMpb996pb/YzkjkAxqHguMid0c1taelyW8n17nEDoWvlV9Qqbo8cerhgURo1OBt2zENLjQQ0kOkPxJx4qx3652e0kbkr11y50r9BMs418mnJdWselMxkSqQNZ+XotoH5Dwn+3K2a6Wv4OX3Dqb9SF/JTD7lA/tIkNfxgsRlzfEQ01rK1+g7Je10EnDCLEzHpFjvZ5q4EEMcYqY+osLFpHAOWGLMx+3eY4pz/xEzRP/x3sjGU09uNOZ3oCWUfSkE4xebnnWtxwWZKyFmv3GHtaqJn2UvpAbODPEYyYcOS3XV3zd233W3C09YYnFUyZbGLXpD05Yet5fZfGTnveMRn5/9LZai+dBPwoMWUJdX4yPnGXgOG8zk0u1nWfcNJfYg+xajSUDiMKjDhlkuFK/GXNYuINe42s1TxzL7pJ4X4UhqLiopeJvPg/U5xdCV5pxVKf1MVenrGe2pfwf1Yr2WMv5w== rcarrillocruz@infra
+
+            ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILOjz+dkwRWTJcW9Gt3iGHSzRBsvVlTAK6G2oH3+0D41 iwienand+osinfra@redhat.com
+
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtNtbgLw0dyRVnuwZz4oUcWTzEUtpO2V47t4ykijdH1hkEe7qkuusM5bD8pC4L3wDZP5U3lsIAvZ97LCQp+MNJz1j8cjXuAboqP5FC3TtCJR1WtCWmOBSO7sIvcsgwse/9KZN/TETOGA9no1oKS43Adi9bXrRFAKDAAM34IVt/UHNS51vxUhuGv+56yJmaki7CjxrGtXcB4hi+TCQAfKJPzhAMwcFQUyvXJkRei6NN6uYyHnVtLR3KXEkeTesZ2GQxmQ+1jmCMN1zUN2VLypmDqAvlKtuQW+3nY89q4HDwzCpuC1rscJgOuncdMahTMoKA3/dQtT4WuJIwLQa3tEEn shrews2018
+
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCuP0CZE8AYnbm8gxecCxKeRw0wHRyryd+FKmNNsdr0d3UvfCbqNzLigrqEBZsKpofi3M4qCWNpKRyfhnjPynLTQjP1vnX9AbL9UGoiHxScfvh3skntTYMs9ezJRd0rMJJZO76FPo8bJLDlwxAQl8m/nuj3HfYiO5hYE7P+a3rhsJh4nEfBb7xh+Q5yM0PWObkkBl6IRiBYjlcsXNZHgTA5kNuihUk5bHqAw54sHh05DhpgOITpTw4LFbh4Ew2NKq49dEb2xbTuAyAr2DHNOGgIwKEZpwtKZEIGEuiLbb4DQRsfivrvyOjnK2NFjQzGyNOHfsOldWHRQwUKUs8nrxKdXvqcrfMnSVaibeYK2TRL+6jd9kc5SIhWI3XLm7HbX7uXMD7/JQrkL25Rcs6nndDCH72DJLz+ynA/T5umMbNBQ9tybL5z73IOpfShRGjQYego22CxDOy7e/5OEMHNoksbFb1S02viM9O2puS7LDqqfT9JIbbPqCrbRi/zOXo0f4EXo6xKUAmd8qlV+6f/p57/qFihzQDaRFVlFEH3k7qwsw7PYGUTwkPaThe6xyZN6D5jqxCZU3aSYu+FGb0oYo+M5IxOm0Cb4NNsvvkRPxWtwSayfFGu6+m/+/RyA3GBcAMev7AuyKN+K2vGMsLagHOx4i+5ZAcUwGzLeXAENNum3w== pabelanger@redhat.com
+
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDDyXfFj44OTsJZnHbecbYrwA8zXuMiULb+o326maOh3wh5/6fk+MzivkUzJC2uZqAlKvBnNXsrb/07eV1gRjaIQBQJxaV9HQUwMNX7AkjkDzaMXVDjG/JOium90R23gVGMukzp9IamezUscAqAxVK+2C10k3tq8dZ/GeZfHl3NFGRHlIAXsJ/SIQoxJAEA0IQ/8Y50nR1Hp2mV2xsfxH9oZhLR/eiFdhJpNupdfw/oE9+vpCHS8SG88KGeLYbn+EhH6LSCD+6WNthF6oE7NANnScqn1Fl0ZpSd3RlRb+kDVKGqNxfB7EJTeimYvqaYmrTiTZTaTJua5Bj5yBTudqnBgdHCz3xMb2Nv2s2INNcJmP/CKpivYQ8AJs6cVlqRWnLJiNQQYCj+xAXBvY5T0Xq/qOhVifLiWZvZQOTHFWqFP9asZkrGa1mFWIaR9VPQY0FoYlUOT9t6J6TRbzktJIuP5AiOVoJLL6wjZuUMjghHfkYbqtyBqE4BbCY8YF3JSf8jx+9eWy+sD+dRwKXBCrGV0dNidioZR7ZJpBb6ye8wElebjPZizKhppsNpwtRxPfiAM52f55lXGD7IDpz9CZrOKUcV2uc3Rhl50u7T3psZfX7GysZvlnAH+Yr+UM+LPBAabXAfKlMnJp+SskLuOplTeQrvAwMluBmFnla8TnwnxQ== dmsimard@hostname
+
+            ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGmc5fbzMptjAb5D86zSH13ZYCbf3QuV1jk9hL0r1qHw frickler@os-infra-2017
+
+      - name: bridge-root-2014-09-15
+        public_key: |
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSLlN41ftgxkNeUi/kATYPwMPjJdMaSbgokSb9PSkRPZE7GeNai60BCfhu+ky8h5eMe70Bpwb7mQ7GAtHGXPNU1SRBPhMuVN9EYrQbt5KSiwuiTXtQHsWyYrSKtB+XGbl2PhpMQ/TPVtFoL5usxu/MYaakVkCEbt5IbPYNg88/NKPixicJuhi0qsd+l1X1zoc1+Fn87PlwMoIgfLIktwaL8hw9mzqr+pPcDIjCFQQWnjqJVEObOcMstBT20XwKj/ymiH+6p123nnlIHilACJzXhmIZIZO+EGkNF7KyXpcBSfv9efPI+VCE2TOv/scJFdEHtDFkl2kdUBYPC0wQ92rp puppet-remote-2014-09-15
+
+  - name: openstackci-flavors
+    flavors:
+      - name: nodepool
+        ram: 8192
+        vcpus: 8
+        disk: 80
+      - name: mirror
+        ram: 8192
+        vcpus: 4
+        disk: 250
+
+  - name: admin-roles
+    roles:
+      - name: Member
+
+  - name: openstackci-user-roles
+    user_roles:
+      - role: Member
+        user: openstackci
+        project: openstackci
+
+  - name: openstackzuul-user-roles
+    user_roles:
+      - role: Member
+        user: openstackzuul
+        project: openstackzuul
+
+  - name: openstackci-networking
+    networks:
+      - name: openstackci-network1
+    subnets:
+      - name: openstackci-subnet1
+        network_name: openstackci-network1
+        cidr: '10.0.1.0/24'
+
+  - name: openstackzuul-networking
+    networks:
+      - name: openstackzuul-network1
+    subnets:
+      - name: openstackzuul-subnet1
+        network_name: openstackzuul-network1
+        cidr: '10.0.1.0/24'
+
+cloud_launcher_clouds:
+  # ovh
+  - name: openstackci-ovh-bhs1
+    oscc_cloud: openstackci-ovh
+    region_name: BHS1
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+  - name: openstackjenkins-ovh-bhs1
+    oscc_cloud: openstackjenkins-ovh
+    region_name: BHS1
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+  - name: openstackci-ovh-gra1
+    oscc_cloud: openstackci-ovh
+    region_name: GRA1
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+  - name: openstackjenkins-ovh-gra1
+    oscc_cloud: openstackjenkins-ovh
+    region_name: GRA1
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+
+  # inap
+  - name: openstackci-inap-mtl01
+    oscc_cloud: openstackci-inap
+    region_name: mtl01
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+  - name: openstackjenkins-inap-mtl01
+    oscc_cloud: openstackjenkins-inap
+    region_name: mtl01
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+
+  # vexxhost
+  - name: openstackci-vexxhost-mtl1
+    oscc_cloud: openstackci-vexxhost
+    region_name: ca-ymq-1
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+  - name: openstackjenkins-vexxhost-mtl1
+    oscc_cloud: openstackjenkins-vexxhost
+    region_name: ca-ymq-1
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+  - name: openstackci-vexxhost-sjc1
+    oscc_cloud: openstackci-vexxhost
+    region_name: sjc1
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+  - name: openstackjenkins-vexxhost-sjc1
+    oscc_cloud: openstackjenkins-vexxhost
+    region_name: sjc1
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+
+  # rackspace
+  - name: openstackci-rax-dfw
+    oscc_cloud: openstackci-rax
+    region_name: DFW
+    profiles:
+      - openstackci-keypairs
+  - name: openstackjenkins-rax-dfw
+    oscc_cloud: openstackjenkins-rax
+    region_name: DFW
+    profiles:
+      - openstackci-keypairs
+  - name: openstackci-rax-ord
+    oscc_cloud: openstackci-rax
+    region_name: ORD
+    profiles:
+      - openstackci-keypairs
+  - name: openstackjenkins-rax-ord
+    oscc_cloud: openstackjenkins-rax
+    region_name: ORD
+    profiles:
+      - openstackci-keypairs
+  - name: openstackci-rax-iad
+    oscc_cloud: openstackci-rax
+    region_name: IAD
+    profiles:
+      - openstackci-keypairs
+  - name: openstackjenkins-rax-iad
+    oscc_cloud: openstackjenkins-rax
+    region_name: IAD
+    profiles:
+      - openstackci-keypairs
+
+  # Citycloud
+  - name: openstackci-citycloud-Lon1
+    oscc_cloud: openstackci-citycloud
+    region_name: Lon1
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+      - openstackci-networking
+    routers:
+      - name: openstackci-router1
+        network: ext-net
+        interfaces:
+          - openstackci-subnet1
+  - name: openstackzuul-citycloud-Lon1
+    oscc_cloud: openstackzuul-citycloud
+    region_name: Lon1
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+      - openstackzuul-networking
+    routers:
+      - name: openstackzuul-router1
+        network: ext-net
+        interfaces:
+          - openstackzuul-subnet1
+  - name: openstackci-citycloud-Kna1
+    oscc_cloud: openstackci-citycloud
+    region_name: Kna1
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+      - openstackci-networking
+    routers:
+      - name: openstackci-router1
+        network: ext-net
+        interfaces:
+          - openstackci-subnet1
+  - name: openstackzuul-citycloud-Kna1
+    oscc_cloud: openstackzuul-citycloud
+    region_name: Kna1
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+      - openstackzuul-networking
+    routers:
+      - name: openstackzuul-router1
+        network: ext-net
+        interfaces:
+          - openstackzuul-subnet1
+  - name: openstackci-citycloud-Sto2
+    oscc_cloud: openstackci-citycloud
+    region_name: Sto2
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+      - openstackci-networking
+    routers:
+      - name: openstackci-router1
+        network: ext-net
+        interfaces:
+          - openstackci-subnet1
+  - name: openstackzuul-citycloud-Sto2
+    oscc_cloud: openstackzuul-citycloud
+    region_name: Sto2
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+      - openstackzuul-networking
+    routers:
+      - name: openstackzuul-router1
+        network: ext-net
+        interfaces:
+          - openstackzuul-subnet1
+
+  # Linaro
+  - name: openstackci-linaro-london
+    oscc_cloud: openstackci-linaro-london
+    region_name: London
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+    images:
+      - name: ubuntu-xenial
+        download_image_url: https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-arm64-uefi1.img
+        download_image_dest: /tmp/ubuntu-xenial-aarch64-uefi.img
+        filename: /tmp/ubuntu-xenial-aarch64-uefi.img
+        properties:
+          hw_firmware_type: uefi
+          os_command_line: console=ttyAMA0
+          hw_disk_bus: scsi
+          hw_scsi_model: virtio-scsi
+  - name: openstackzuul-linaro-london
+    oscc_cloud: openstackzuul-linaro-london
+    region_name: London
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+
+  - name: openstackci-linaro-us
+    oscc_cloud: openstackci-linaro-us
+    region_name: RegionOne
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+
+  - name: openstackzuul-linaro-us
+    oscc_cloud: openstackzuul-linaro-us
+    region_name: RegionOne
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+
+  # Limestone
+  - name: openstackci-limestone
+    oscc_cloud: openstackci-limestone
+    region_name: RegionOne
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+  - name: openstackzuul-limestone
+    oscc_cloud: openstackzuul-limestone
+    region_name: RegionOne
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+
+  # Open Edge
+  - name: openstackci-openedge
+    oscc_cloud: openstackci-openedge
+    region_name: us-east
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+  - name: openstackzuul-openedge
+    oscc_cloud: openstackzuul-openedge
+    region_name: us-east
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+
+  - name: opendevci-airship-kna1
+    oscc_cloud: opendevci-airship
+    region_name: Kna1
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+      - openstackci-networking
+    routers:
+      - name: openstackci-router1
+        network: ext-net
+        interfaces:
+          - openstackci-subnet1
+  - name: opendevzuul-airship-kna1
+    oscc_cloud: opendevzuul-airship
+    region_name: Kna1
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+      - openstackci-networking
+    routers:
+      - name: openstackci-router1
+        network: ext-net
+        interfaces:
+          - openstackci-subnet1
--- a/playbooks/roles/cloud-launcher-cron/README.rst
+++ b/playbooks/roles/cloud-launcher-cron/README.rst
@ -1,33 +0,0 @@
-Setup periodic runs of ``run_cloud_launcher.sh``, which runs the cloud setup
-playbook against our clouds.
-
-Note that this runs in an independent cron beacuse we don't need to run it
-as frequently as our normal ansible runs and this ansible process needs
-access to the all-clouds.yaml file which we don't run the normal ansible runs
-with.
-
-**Role Variables**
-
-.. zuul:rolevar:: cloud_launcher_cron_interval
-
-   .. zuul:rolevar:: minute
-      :default: 0
-
-   .. zuul:rolevar:: hour
-      :default: */1
-
-   .. zuul:rolevar:: day
-      :default: *
-
-   .. zuul:rolevar:: month
-      :default: *
-
-   .. zuul:rolevar:: weekday
-      :default: *
-
-   .. zuul:rolevar:: cloud_launcher_disable_job
-      :default: false
-
-      Prevent installation of cron job.  This is only useful for CI
-      jobs testing bridge.o.o so that the test host does not randomly
-      run the script during CI tests that fall during the interval.
--- a/playbooks/roles/cloud-launcher-cron/defaults/main.yaml
+++ b/playbooks/roles/cloud-launcher-cron/defaults/main.yaml
@ -1,7 +0,0 @@
-cloud_launcher_cron_interval:
-  minute: '0'
-  hour: '*/1'
-  day: '*'
-  month: '*'
-  weekday: '*'
-cloud_launcher_disable_job: false
--- a/playbooks/roles/cloud-launcher-cron/tasks/main.yaml
+++ b/playbooks/roles/cloud-launcher-cron/tasks/main.yaml
@ -1,22 +0,0 @@
- name: Ensure directory exists for lock files
-  file:
-    state: directory
-    path: /var/run/ansible
-
- name: Set up cron job for running run_cloud_launcher.sh
-  cron:
-    name: run_cloud_launcher.sh
-    state: present
-    disabled: "{{ cloud_launcher_disable_job }}"
-    job: '/usr/bin/flock -n /var/run/ansible/run_cloud_launcher.lock /bin/bash /home/zuul/src/opendev.org/opendev/system-config/run_cloud_launcher.sh -c >> /var/log/ansible/run_cloud_launcher_cron.log 2>&1'
-    minute: "{{ cloud_launcher_cron_interval.minute }}"
-    hour: "{{ cloud_launcher_cron_interval.hour }}"
-    day: "{{ cloud_launcher_cron_interval.day }}"
-    month: "{{ cloud_launcher_cron_interval.month }}"
-    weekday: "{{ cloud_launcher_cron_interval.weekday }}"
-
- name: Setup log rotation
-  include_role:
-    name: logrotate
-  vars:
-    logrotate_file_name: /var/log/ansible/run_cloud_launcher_cron.log
--- a/playbooks/run_cloud_launcher.yaml
+++ b/playbooks/run_cloud_launcher.yaml
@ -1,6 +1,7 @@
- hosts: localhost
+- hosts: bridge.openstack.org:!disabled
  name: "Cloud-launcher: Run cloud launcher"
-  connection: local
  gather_facts: false
  roles:
-    - cloud-launcher
+    - role: cloud-launcher
+      profiles: '{{ cloud_launcher_profiles }}'
+      clouds: '{{ cloud_launcher_clouds }}'
--- a/playbooks/service-bridge.yaml
+++ b/playbooks/service-bridge.yaml
@ -1,13 +1,16 @@
 - hosts: bridge.openstack.org:!disabled
  name: "Bridge: configure the bastion host"
  roles:
-    - cloud-launcher-cron
    - edit-secrets-script
    - install-docker
    - install-osc-container
    - install-kubectl
    - configure-kubectl
  tasks:
+    - name: Remove cloud launcher cron
+      cron:
+        name: run_cloud_launcher.sh
+        state: absent
    - include_role:
        name: configure-openstacksdk
      vars:
--- a/run_cloud_launcher.sh
+++ b/run_cloud_launcher.sh
@ -1,61 +0,0 @@
-#!/bin/bash
-
-# Copyright 2014 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-# If updating the puppet system-config repo or installing puppet modules
-# fails then abort the puppet run as we will not get the results we
-# expect.
-set -e
-export ANSIBLE_LOG_PATH=/var/log/puppet_run_cloud_launcher.log
-SYSTEM_CONFIG=/home/zuul/src/opendev.org/opendev/system-config
-ANSIBLE_PLAYBOOKS=$SYSTEM_CONFIG/playbooks
-
-# It's possible for connectivity to a server or manifest application to break
-# for indeterminate periods of time, so the playbooks should be run without
-# errexit
-set +e
-
-# We only send stats if running under cron
-UNDER_CRON=0
-
-while getopts ":c" arg; do
-    case $arg in
-        c)
-            UNDER_CRON=1
-            ;;
-    esac
-done
-
-_START_TIME=$(date '+%s')
-
-echo "--- begin run @ $(date -Is) ---"
-
-# Pass -i /dev/null to avoid the ansible-playbook run with all-clouds.yaml
-# being active messing with the normal inventory cache.
-/usr/bin/timeout -k 2m 120m /usr/local/bin/ansible-playbook -i /dev/null -f 1 \
-    ${ANSIBLE_PLAYBOOKS}/run_cloud_launcher.yaml \
-    -e@${ANSIBLE_PLAYBOOKS}/clouds_layouts.yml
-
-echo "--- end run @ $(date -Is) ---"
-
-# Only send stats under cron conditions
-if [[ ${UNDER_CRON} != 1 ]]; then
-    return
-fi
-
-_CURRENT_TIME=$(date '+%s')
-_ELAPSED_MS=$(( (_CURRENT_TIME - _START_TIME) * 1000 ))
-echo "bridge.ansible.run_cloud_launcher:${_ELAPSED_MS}|ms" | \
-    nc -w 1 -u graphite.opendev.org 8125
--- a/testinfra/test_bridge.py
+++ b/testinfra/test_bridge.py
@ -40,12 +40,6 @@ def test_openstacksdk_config(host):
    assert f.mode == 0o640


-def test_cloud_launcher_cron(host):
-    with host.sudo():
-        crontab = host.check_output('crontab -l')
-        assert 'run_cloud_launcher.sh' in crontab
-
-
 def test_root_authorized_keys(host):
    authorized_keys = host.file('/root/.ssh/authorized_keys')
    assert authorized_keys.exists