2 files changed, 40 insertions, 125 deletions

diff --git a/src/talks/who-cares.hbs b/src/talks/who-cares.hbs
index e236e4c..3ee0c2e 100644
--- a/src/talks/who-cares.hbs
+++ b/src/talks/who-cares.hbs
@@ -65,7 +65,7 @@
 
 
       <p class='fragment'>10-20k VMs per-day</p>
-      <p class='fragment'>10 Cloud Regions in 7 clouds</p>
+      <p class='fragment'>12 Cloud Regions in 8 clouds</p>
       <p class='fragment'>Only using OpenStack APIs</p>
 
     </section>
@@ -96,12 +96,12 @@
       <h1>1.7 Million Test Jobs in the last 6 Months</h1>
     </section>
 
-    <section id="million-tests-in-a-month" class="slide level2" data-transition='zoom'>
-      <h1>15 Million Tests in a month</h1>
+    <section id="kjph" class="slide level2" data-transition='zoom'>
+      <h1>2 kjph</h1>
     </section>
 
-    <section id="terabytes-of-log-data-in-six-months" class="slide level2" data-transition='zoom'>
-      <h1>18 Terabytes of Log Data in six months</h1>
+    <section id="kilo-jobs-per-hour" class="slide level2" data-transition='zoom'>
+      <h1>2 klo jobs per hour</h1>
     </section>
 
     <section id="our-vms-are-everywhere" class="slide level2">
@@ -109,20 +109,19 @@
       <h3>Public Clouds</h3>
       <ul>
         <li>Rackspace: Dallas, Chicago, DC</li>
-        <li>Internap: New York</li>
+        <li>Internap: New Jersey, Montreal</li>
         <li>OVH: Strassbourg, Gravelines</li>
-        <li>Vexxhost: Montreal</li>
-        <li>OpenStack Innovation Center: San Antonio</li>
       </ul>
-      <h3>Private Clouds</h3>
+      <h3>Managed Private Clouds</h3>
       <ul>
+        <li>OpenStack Innovation Center: San Antonio</li>
         <li>Blue Box: San Jose</li>
-        <li>Red Hat: Phoenix</li>
+        <li>Red Hat TripleO: Phoenix</li>
       </ul>
     </section>
 
     <section id="we-also-have-servers" class="slide level2">
-      <h1>We also have servers</h1>
+      <h1>Private Cloud</h1>
       <h2>Infra Cloud</h2>
       <ul>
         <li>Hardware donated by HPE: Houston</li>
@@ -132,8 +131,7 @@
     </section>
 
     <section id="architecture" class="slide level2">
-      <h1>Architecture</h1>
-      <p><img src="/images/infra_architecture.jpg" alt="image" /></p>
+      <p><img src="/images/infra-zuul-architecture.png" alt="image" /></p>
     </section>
 
     <section class="slide level2">
@@ -150,6 +148,7 @@
       <img src="/images/gerrit-graph.png" />
     </section>
 
+    <!--
     <section class="slide level2">
       <h1>Fun Numbers</h1>
       <ul>
@@ -162,6 +161,7 @@
     <section class="slide level2">
       <img src="/images/what-happens.png" />
     </section>
+    -->
 
     <section class="slide level2">
       <h1>nodepool</h1>
@@ -209,13 +209,18 @@
       <p>~/.config/openstack/clouds.yaml</p>
       <pre>
 clouds:
-  vexxhost:
+  citycloud:
      profile: vexxhost
      auth:
-       project_name: d8af8a8f-a573-48e6-898a-af333b970a2d
-       username: 0b8c435b-cc4d-4e05-8a47-a2ada0539af1
-       password: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-     region_name: ca-ymq-1
+      username: mordred
+      password: XXXXXXXXXXXXXXXXXXXXX
+      project_id: 65222a4d09ea4c68934fa1028c77f394
+      user_domain_id: d0919bd5e8d74e49adf0e145807ffc38
+      project_domain_id: d0919bd5e8d74e49adf0e145807ffc38
+    regions:
+      - Kna1
+      - Sto2
+      - Lon1
   dreamcompute:
     profile: dreamhost
     auth:
@@ -243,15 +248,15 @@ cloud.create_server('my-server', image='immage-name', auto_ip=True)
       <p>Part of 2.0 release</p>
       <pre>
 - os_keypair:
-    cloud: hp-mordred
+    cloud: citycloud
     name: mordred
     public_key_file: ~/.ssh/id_rsa.pub
 - os_image:
-    cloud: hp-mordred
+    cloud: citycloud
     name: Monty Ubuntu
     file: ubuntu.vhd
 - os_server:
-    cloud: hp-mordred
+    cloud: citycloud
     name: my-server
     flavor_ram: 1024
     image: Monty Ubuntu
@@ -273,6 +278,7 @@ cloud.create_server('my-server', image='immage-name', auto_ip=True)
       </pre>
     </section>
 
+    <!--
     <section class="slide level2">
       <h1>Ansible Role Cloud Launcher</h1>
       <h2>http://git.openstack.org/cgit/openstack/ansible-role-cloud-launcher</h2>
@@ -303,6 +309,7 @@ clouds:
       - ops
       </pre>
     </section>
+    -->
 
     <section class="slide level2">
       <h1>nodepool</h1>
@@ -352,7 +359,7 @@ clouds:
         <li>Put it near your users</li>
         <li>Don't put it in an NSA data center</li>
         <li>Locality Requirements</li>
-        <li class='fragment'>What if you have customers in China?</li>
+        <li class='fragment'>What if you have customers in Sweden?</li>
       </ul>
     </section>
 
@@ -395,27 +402,27 @@ clouds:
     </section>
 
     <section class="slide level2">
-      <h1>Chinese OpenStack</h1>
-      <p>UnitedStack</p>
-      <p>Huawei</p>
-      <p>UMCloud</p>
-      <p>EasyStack</p>
-      <p>99 Cloud</p>
-    </section>
-
-    <section class="slide level2">
       <h1>European Public OpenStack</h1>
-      <p>OVH: France</p>
       <p>CityCloud: Sweden, UK</p>
-      <p>Elastx: Sweden</p>
       <p>Datacentred: UK</p>
+      <p>Elastx: Sweden</p>
       <p>Enter Cloud Suite: Italy, Germany, Frankfurt</p>
       <p>Internap: Netherlands, US</p>
+      <p>OVH: France</p>
       <p>Ultimum: Czech Republic</p>
       <p>Zetta: Norway</p>
     </section>
 
     <section class="slide level2">
+      <h1>Chinese OpenStack</h1>
+      <p>UnitedStack</p>
+      <p>Huawei</p>
+      <p>UMCloud</p>
+      <p>EasyStack</p>
+      <p>99 Cloud</p>
+    </section>
+
+    <section class="slide level2">
       <h1>OpenStack gives you the power to make the choices that
         are right for you and for your business</h1>
     </section>
diff --git a/src/talks/zuulv3.hbs b/src/talks/zuulv3.hbs
deleted file mode 100644
index 06d91e6..0000000
--- a/src/talks/zuulv3.hbs
+++ /dev/null
@@ -1,92 +0,0 @@
-<!doctype html>
-<html lang="en">
-
-  <head>
-    <meta charset="utf-8">
-
-    <title>Zuul v3</title>
-
-  </head>
-  <body>
-
-    <section id="zuul-v2-current-status" class="slide level2">
-      <h1>Zuul v2 Current Status</h1>
-      <ul>
-        <li>In production for OpenStack</li>
-        <li>Also in use by ~50 3rd-party CI systems for OpenStack</li>
-        <li>Also in use by Wikimedia, HPE and others</li>
-        <li>Receives events from and reports results to Gerrit</li>
-        <li>Multiple git repository relationship aware</li>
-        <li>Nodepool attaches single-use cloud slaves to Jenkins Master Pool</li>
-        <li>Triggers jobs on Jenkins Pool for executing job content</li>
-        <small>Jenkins serves no role except remote execution</small>
-      </ul>
-    </section>
-
-    <section class="slide level2">
-      <h1>What is Zuul v3</h1>
-      <ul>
-        <li>Replace Jenkins with Ansible</li>
-        <li>Change zuul/nodepool interaction to zuul requesting N resources from nodepool
-          <ul>
-            <li>Zuul requests N resources from nodepool</li>
-            <li>Zuul creates ansible inventory, passes to job executors</li>
-            <li>Job executor runs job content on build resources using ansible + inventory</li>
-          </ul>
-        </li>
-        <li>Add github PR integration in addition to gerrit</li>
-        <li>Add multi-tenancy for job configs and secrets</li>
-        <li>Add in-repo job configs - self testing CI config</li>
-        <li>Add reusable build resources (such as bare metal)</li>
-        <li>Add container build resources (docker, kubernetes)</li>
-      </ul>
-
-    </section>
-
-    <section id="zuul-v3-current-status" class="slide level2">
-      <h1>Zuul v3 Current Status</h1>
-      <ul>
-        <li>Zuul v3 Spec is approved - OpenStack CI will move to it</li>
-        <li>First phase of all the hard bits is done in the v3 branch</li>
-        <li>Nodepool v2 branching now as nodepool/shade integration has landed</li>
-        <li>Estimate 2 months of effort to be at initial feature complete for OpenStack</li>
-      </ul>
-    </section>
-
-    <section class="slide level2">
-      <h1>Zuul v3 Future need</h1>
-      <ul>
-        <li>Supporting expanded userbases outside of OpenStack adds importance to original wishlist features
-          <ul>
-            <li>Github Integration</li>
-            <li>Container Integration</li>
-            <li>Non-OpenStack Cloud (AWS, GCE, Azure)</li>
-          </ul>
-        </li>
-        <li>Github support for the v2 branch already written, not merged pending v3</li>
-        <li>Initial design for container integration done
-          <ul>
-            <li>Need a deeper detailed spec</li>
-          </ul>
-        </li>
-        <li>Non-OpenStack Cloud simple to implement in nodepool v2</li>
-      </ul>
-    </section>
-
-    <section class="slide level2">
-      <h1>Zuul v2.5</h1>
-      <ul>
-        <li>Waiting for Zuul v3 got costly</li>
-        <li>Zuul "2.5" is a release-valve to solve immedate problems
-          <ul>
-            <li>Jenkins replaced by Ansible</li>
-            <li>Ansible workers directly read Jenkins Job Builder templates</li>
-            <li>Accelerating review of github PR patches with view of landing in weeks</li>
-          </ul>
-        </li>
-      </ul>
-    </section>
-
-
-  </body>
-</html>