1 files changed, 77 insertions, 173 deletions

diff --git a/src/talks/global-interop.hbs b/src/talks/global-interop.hbs
index 90f17c6..52de08f 100644
--- a/src/talks/global-interop.hbs
+++ b/src/talks/global-interop.hbs
@@ -45,11 +45,22 @@
     </section>
 
     <section class="slide level2">
+      <p>
+      I want to write some new Cloud Native applications while continuing
+      to make use of my existing investments.</p>
+    </section>
+
+    <section class="slide level2">
+      <p>
+      I need to move faster than before AND I need increased stability at
+      the same time.</p>
+    </section>
+
+    <section class="slide level2">
       <h1>THIS WORKS</h1>
       <h3>I'm doing it myself as we speak</h3>
       <img style="float:right; margin-right:24pt" src="/images/graphite.openstack.org.png"/>
 
-
       <p class='fragment'>20k VMs per-day</p>
       <p class='fragment'>20 Cloud Regions in 9 clouds</p>
       <p class='fragment'>Only using OpenStack APIs</p>
@@ -61,20 +72,27 @@
     </section>
 
     <section id="tooling-automation-and-ci-for-openstack-project" class="slide level2" data-transition='zoom'>
-      <h1>Tooling, Automation and CI for OpenStack Project</h1>
+      <h1>Tooling and Automation for the development of OpenStack Project</h1>
     </section>
 
     <section id="developers" class="slide level2" data-transition='zoom'>
-      <h1>2000 Developers</h1>
+      <h1>&gt;2500 Developers</h1>
     </section>
 
     <section id="gated-commits" class="slide level2" data-transition='zoom'>
-      <h1>Gated Commits</h1>
-      <p>Every commit is fully integration tested (twice) before landing</p>
+      <h1>Gated Changes</h1>
+      <p>Every change goes through enforced automatic full integration testing
+      <em>(at least twice)</em> before landing</p>
     </section>
 
-    <section id="each-test-runs-on-a-single-use-cloud-slave" class="slide level2" data-transition='zoom'>
-      <h1>Each Test Runs on a Single Use Cloud Slave</h1>
+    <section id="integration-testing" class="slide level2" data-transition='zoom'>
+      <h1>Integration Testing</h1>
+      <p>Install and run one or more clouds then validate that those clouds
+      work.</p>
+    </section>
+
+    <section id="each-test-runs-on-a-single-use-cloud-server" class="slide level2" data-transition='zoom'>
+      <h1>Each Test Job Runs on Single Use Cloud Servers</h1>
       <p>This is that "cloud scale out" part</p>
     </section>
 
@@ -82,8 +100,8 @@
       <h1>2 KJPH (kilo-jobs per hour)</h1>
     </section>
 
-    <section id="our-vms-are-everywhere" class="slide level2">
-      <h1>Our VMs are everywhere</h1>
+    <section id="our-cloud-servers-are-everywhere" class="slide level2">
+      <h1>Our Cloud Servers are everywhere</h1>
       <h3>Public Clouds</h3>
       <ul>
         <li>Rackspace: Dallas, Chicago, DC</li>
@@ -115,9 +133,9 @@
     <section class="slide level2">
       <h1>Gerrit</h1>
       <ul>
-        <li class="fragment">
-          Traditional 'Enterprise' Java Application</li>
-        <li class="fragment">Single Nova VM, Cinder Volume</li>
+        <li class="fragment">Code Review and Code Hosting</li>
+        <li class="fragment">Traditional 'Enterprise' Java Application</li>
+        <li class="fragment">Single OpenStack Nova VM, Cinder Volume</li>
         <li class="fragment">Scale out farm of git replicas</li>
       </ul>
     </section>
@@ -125,9 +143,8 @@
     <section class="slide level2">
       <h1>nodepool</h1>
       <ul>
-        <li class="fragment">Cloud Native</li>
-        <li class="fragment">
-          Purpose built in Python</li>
+        <li class="fragment">Cloud Native resource manager</li>
+        <li class="fragment">Purpose built in Python</li>
         <li class="fragment">Keeps a pool of ready to go nodes</li>
         <li class="fragment">Multi-cloud</li>
         <li class="fragment">Fully elastic - responds to demand</li>
@@ -135,129 +152,22 @@
     </section>
 
     <section class="slide level2">
-      <h1>How do we do this?</h1>
-    </section>
-
-    <section class="slide level2">
-      <h1>Control plane</h1>
-      <h3>http://git.openstack.org/cgit/openstack-infra/system-config</h3>
-      <ul>
-        <li>All server config management in git</li>
-        <li>Puppet manages the servers: puppet apply</li>
-        <li>Ansible runs puppet: ansible puppet module</li>
-        <li>Ansible OpenStack Dynamic Inventory</li>
-        <li>Only thing not public are keys and secrets</li>
-      </ul>
-    </section>
-
-    <section class="slide level2">
-      <h1>os-client-config</h1>
-      <h3>http://git.openstack.org/cgit/openstack/os-client-config</h3>
-      <h3>https://docs.openstack.org/os-client-config/latest/</h3>
-      <p>A library to handle config information for openstack clients</p>
-      <p>Tracks differences in vendors that can't be discovered</p>
-      <p>In use in python-openstackclient, shade and ansible</p>
-      <h3 class='fragment'>https://docs.openstack.org/os-client-config/latest/user/vendor-support.html</h3>
-    </section>
-
-    <section class="slide level2">
-      <h1>os-client-config</h1>
-      <p>~/.config/openstack/clouds.yaml</p>
-      <pre>
-clouds:
-  citycloud:
-     profile: citycloud
-     auth:
-      username: mordred
-      password: XXXXXXXXXXXXXXXXXXXXX
-      project_id: 65222a4d09ea4c68934fa1028c77f394
-      user_domain_id: d0919bd5e8d74e49adf0e145807ffc38
-      project_domain_id: d0919bd5e8d74e49adf0e145807ffc38
-    regions:
-      - Kna1
-      - Sto2
-      - Lon1
-  dreamcompute:
-    profile: dreamhost
-    auth:
-      username: montay6
-      project_name: dhc2111978
-      password: XXXXXXXXXXXXX
-    region_name: RegionOne
-      </pre>
-    </section>
-
-    <section class="slide level2">
-      <h1>shade</h1>
-      <h3>http://git.openstack.org/cgit/openstack-infra/shade</h3>
-      <p>A library to wrap business logic around client libraries</p>
-      <pre>
-cloud.create_image('image-name', filename='image-filename.qcow2')
-cloud.create_server('my-server', image='immage-name', auto_ip=True)
-      </pre>
-      <p>In use in Infra Nodepool and ansible</p>
-    </section>
-
-    <section class="slide level2">
-      <h1>ansible</h1>
-      <p>Based on shade</p>
-      <pre>
-- os_keypair:
-    cloud: citycloud
-    name: mordred
-    public_key_file: ~/.ssh/id_rsa.pub
-- os_image:
-    cloud: citycloud
-    name: Monty Ubuntu
-    file: ubuntu.vhd
-- os_server:
-    cloud: citycloud
-    name: my-server
-    flavor_ram: 1024
-    image: Monty Ubuntu
-      </pre>
-    </section>
-
-    <section class="slide level2">
-      <h1>ansible</h1>
-      <h2>Add my keypair to 12 clouds<h2>
-      <pre><code>
-- os_keypair:
-    cloud: "{{ item.cloud }}"
-    region_name: "{{ item.region_name }}"
-    name: mordred
-    public_key_file: ~/.ssh/id_rsa.pub
-    with-items:
-    - {cloud: vexxhost, region_name: ca-ymq-1}
-    - {cloud: ovh, region_name: GRA1}
-    - {cloud: ustack, region_name: bj1}
-    - {cloud: citycloud, region_name: Sto2}
-    - {cloud: internap, region_name: sin01}
-    - {cloud: fuga, region_name: cystack}
-    - {cloud: datacentred, region_name: sal01}
-    - {cloud: rax, region_name: SYD}
-    - {cloud: clouda, region_name: regionOne}
-    - {cloud: auro, region_name: van1}
-    - {cloud: zetta, region_name: no-osl1}
-    - {cloud: kiss, region_name: region1}
-      </code></pre>
-    </section>
-
-    <section class="slide level2">
-      <h1>nodepool</h1>
+      <h1>zuul</h1>
       <ul>
-        <li>Use shade to treat all cloud regions as one giant cloud</li>
-        <li>diskimage-builder makes identical base images for each</li>
-        <li>Pre-cache network artifacts in disk images</li>
-        <li>glean instead of cloud-init to handle no-DHCP on Rackspace</li>
-        <li>Pre-spins warm pool - always keep min-ready number of nodes</li>
+        <li>"Test it like you deploy it"</li>
+        <li>The Gatekeeper</li>
+        <li class="fragment">Microservices but with a centralized scheduler</li>
+        <li class="fragment">Responds to code review events from Gerrit</li>
+        <li class="fragment">Runs Ansible content on nodes from nodepool</li>
+        <li class="fragment">Use production Ansible to test proposed changes</li>
+        <small>Talk about Zuul Tomorrow 15:50-16:15 on stage OP5</small>
       </ul>
     </section>
 
     <section class="slide level2">
       <h1>OpenStack Works!</h1>
       <p class='fragment'>Why should you care?</p>
-      <p class='fragment'>Is interop really important?</p>
+      <p class='fragment'>Is interoperability really important?</p>
     </section>
 
     <section class="slide level2">
@@ -270,30 +180,25 @@ cloud.create_server('my-server', image='immage-name', auto_ip=True)
     <section class="slide level2">
       <h1>Run it where you want</h1>
       <ul>
-        <li>Geography</li>
-        <li>Delivery Model</li>
-      </ul>
-
-    </section>
-
-    <section class="slide level2">
-      <h1>Geography</h1>
-      <ul>
         <li>Put it near your users</li>
-        <li>Don't put it in an US data center</li>
+        <li>Avoid putting it in an US data center</li>
         <li>Locality Requirements</li>
         <li class='fragment'>What if you have customers in China?</li>
-        <li class='fragment'>What if you also have customers in Sweden?</li>
+        <li class='fragment'>What if you also have customers in Sweden?
+          <span class='fragment'>New Zealand?</span>
+          <span class='fragment'>Brazil?</span>
+        </li>
       </ul>
     </section>
 
     <section class="slide level2">
-      <h1>Delivery Model</h1>
+      <h1>Run it how you want</h1>
       <ul>
         <li>Public</li>
         <li>Hosted Private</li>
         <li>Managed Private On-Premise</li>
-        <li>Run your own</li>
+        <li>Run your own with a partner/vendor</li>
+        <li>Run your own on your own</li>
       </ul>
     </section>
 
@@ -312,7 +217,7 @@ cloud.create_server('my-server', image='immage-name', auto_ip=True)
 
     <section class="slide level2" data-transition='zoom'>
       <h1>Anybody <em>REALLY</em> think that should run in a
-        Public Cloud owned by a US company?</h1>
+        Public Cloud owned and operated by a US company?</h1>
     </section>
 
     <section class="slide level2" data-transition='zoom'>
@@ -328,34 +233,21 @@ cloud.create_server('my-server', image='immage-name', auto_ip=True)
     </section>
 
     <section class="slide level2">
-      <h1>Chinese OpenStack</h1>
-      <h2>Huawei</h2>
-      <div class='fragment'><p><small>sorted alphabetically</small></p>
-      <p>99 Cloud</p>
-      <p>China Mobile</p>
-      <p>China National Offshore Oil Corp</p>
-      <p>China Telecom</p>
-      <p>China Unicom</p>
-      <p>EasyStack</p>
-      <p>Inspur</p>
-      <p>Sinorail</p>
-      <p>State Grid of China</p>
-      <p>T2 Cloud</p>
-      <p>Tencent</p>
-      <p>UMCloud</p>
-      <p>UnitedStack</p>
-      <p>ZTE</p>
+      <h1>OpenStack in Asia</h1>
+      <h2>Huawei: First Chinese Platinum Member of OpenStack Foundation</h2>
+      <p class='fragment'>
+      Only 8 of the 24 Gold Member Companies are non-Asian</p>
     </section>
 
     <section class="slide level2">
-      <h1>European Public OpenStack</h1>
+      <h1>European OpenStack Public Clouds</h1>
       <p>CityCloud: Sweden, UK, US</p>
       <p>Datacentred: UK</p>
       <p>Elastx: Sweden</p>
       <p>Enter Cloud Suite: Italy, Germany</p>
       <p>Fugo: Netherlands</p>
       <p>Internap: Netherlands, US, Singapore</p>
-      <p>OTC: Frankfurt</p>
+      <p>OTC: Germany</p>
       <p>OVH: France, US</p>
       <p>Switch: Switzerland</p>
       <p>Ultimum: Czech Republic</p>
@@ -364,13 +256,15 @@ cloud.create_server('my-server', image='immage-name', auto_ip=True)
     </section>
 
     <section class="slide level2">
-      <h1>Other Public OpenStack</h1>
+      <h1>Other Public OpenStack Clouds</h1>
+      <p><small>That I personally have an account on</small></p>
       <p>Auro: Vancouver</p>
       <p>Catalyst: New Zealand</p>
       <p>Conoha: Japan, Singapore, US</p>
       <p>Dreamhost: US</p>
-      <p>Ormuco: Canada + Federated</p>
+      <p>Ormuco: Canada, Federated Worldwide</p>
       <p>Vexxhost: Canada</p>
+      <p>UnitedStack: China</p>
     </section>
 
     <section class="slide level2">
@@ -379,13 +273,11 @@ cloud.create_server('my-server', image='immage-name', auto_ip=True)
 
     <section class="slide level2">
       <h1>The OpenStack Project Believes all Participants are Equal</h1>
-      <p class='fragment'>Constant work in progress, help us when we get this
-      wrong</p>
     </section>
 
     <section class="slide level2">
-      <h1><em>We</em> aren't going to remove something <em>you</em> need...</h1>
-      <p class='fragment'>because we <em>ARE</em> you.</p>
+      <h1><em>OpenStack</em> isn't going to remove something <em>you</em> need...</h1>
+      <p class='fragment'>because OpenStack <em>IS</em> you.</p>
     </section>
 
     <section class="slide level2">
@@ -419,10 +311,22 @@ cloud.create_server('my-server', image='immage-name', auto_ip=True)
       <h1>It's all about the tools</h1>
       <ul>
         <li>Ansible</li>
+        <li>OpenShift</li>
         <li>Terraform</li>
         <li>Spinnaker</li>
-        <li>Zuul<small class='fragment'> -- v3 is almost out and will blow your mind</small></li>
+        <li>Zuul</li>
+      </ul>
+    </section>
+
+    <section class="slide level2">
+      <h1>Ansible OpenStack Modules</h1>
+      <ul>
+        <li>Based on the API consumption code from nodepool: "shade"</li>
+        <li>Support all of the known OpenStack Public Clouds</li>
+        <li>Interoperable == you can use them with your cloud</li>
+        <li class='fragment'>Maintained by me</li>
       </ul>
+      <small class='fragment'>Talk about Ansible and OpenStack Today 16:00 - 17:00</small>
     </section>
 
     <section class="slide level2">
@@ -442,8 +346,8 @@ cloud.create_server('my-server', image='immage-name', auto_ip=True)
     </section>
 
     <section class="slide level2">
-      <h1>China, and the rest of our Global Community, understands the power
-        of Open Collaboration on shared problems.</h1>
+      <h1>China understands the power of Open Collaboration on
+        shared problems.</h1>
     </section>
 
     <section class="slide level2">