1 files changed, 167 insertions, 29 deletions

diff --git a/src/talks/who-cares.hbs b/src/talks/who-cares.hbs
index f2675a4..fdc1d2d 100644
--- a/src/talks/who-cares.hbs
+++ b/src/talks/who-cares.hbs
@@ -63,7 +63,7 @@
 
 
       <p class='fragment'>10-20k VMs per-day</p>
-      <p class='fragment'>3 (soon to be 6) clouds</p>
+      <p class='fragment'>10 Cloud Regions in 7 clouds</p>
       <p class='fragment'>Only using OpenStack APIs</p>
 
     </section>
@@ -102,33 +102,30 @@
       <h1>18 Terabytes of Log Data in six months</h1>
     </section>
 
-    <section id="we-have-no-servers" class="slide level2">
-      <h1>We have no servers</h1>
-      <ul>
-        <li>Rackspace Public Cloud</li>
-        <li>HP Helion Public Cloud</li>
-        <li>TripleO Community Cloud hosted at RedHat</li>
-      </ul>
-      <span class='fragment'>
-        <p>Coming soon:</p>
-        <ul>
-          <li>OVH Public Cloud</li>
-          <li>Blue Box Dedicated Cloud on SoftLayer</li>
-          <li>Infra Cloud hosted at HP</li>
-          <li>IBM Public Cloud</li>
-        </ul>
-      </span>
-    </section>
-
     <section id="our-vms-are-everywhere" class="slide level2">
       <h1>Our VMs are everywhere</h1>
+      <h3>Public Clouds</h3>
       <ul>
-        <li>HP: Las Vegas, DC</li>
         <li>Rackspace: Dallas, Chicago, DC</li>
-        <li>RedHat: Phoenix</li>
+        <li>Internap: New York</li>
         <li>OVH: Strassbourg, Gravelines</li>
+        <li>Vexxhost: Montreal</li>
+        <li>OpenStack Innovation Center: San Antonio</li>
+      </ul>
+      <h3>Private Clouds</h3>
+      <ul>
         <li>Blue Box: San Jose</li>
-        <li>IBM: Amsterdam, Dallas, Franfurt, Hong Kong, Houston, London, Montreal, Paris, Querétaro, San Jose, São Paulo, Seattle, Singapore, Sydney, Tokyo, Toronto, DC</li>
+        <li>Red Hat: Phoenix</li>
+      </ul>
+    </section>
+
+    <section id="we-also-have-servers" class="slide level2">
+      <h1>We also have servers</h1>
+      <h2>Infra Cloud</h2>
+      <ul>
+        <li>Hardware donated by HPE: Houston</li>
+        <li>Community run cloud using OpenStack Puppet</li>
+        <li>Bare Metal managed with Bifrost/Ironic</li>
       </ul>
     </section>
 
@@ -182,6 +179,141 @@
     </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>
+      <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 and ansible</p>
+    </section>
+
+    <section class="slide level2">
+      <h1>os-client-config</h1>
+      <p>~/.config/openstack/clouds.yaml</p>
+      <pre>
+clouds:
+  vexxhost:
+     profile: vexxhost
+     auth:
+       project_name: d8af8a8f-a573-48e6-898a-af333b970a2d
+       username: 0b8c435b-cc4d-4e05-8a47-a2ada0539af1
+       password: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+     region_name: ca-ymq-1
+  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>Brand new modules, based on shade</p>
+      <p>Part of 2.0 release</p>
+      <pre>
+- os_keypair:
+    cloud: hp-mordred
+    name: mordred
+    public_key_file: ~/.ssh/id_rsa.pub
+- os_image:
+    cloud: hp-mordred
+    name: Monty Ubuntu
+    file: ubuntu.vhd
+- os_server:
+    cloud: hp-mordred
+    name: my-server
+    flavor_ram: 1024
+    image: Monty Ubuntu
+      </pre>
+    </section>
+
+    <section class="slide level2">
+      <h1>ansible</h1>
+      <p>multi-cloud support</p>
+      <pre>
+- os_keypair:
+    cloud: "{{ item }"
+    name: mordred
+    public_key_file: ~/.ssh/id_rsa.pub
+    with-items:
+    - vexxhost
+    - rackspace
+    - ovh
+      </pre>
+    </section>
+
+    <section class="slide level2">
+      <h1>Ansible Role Cloud Launcher</h1>
+      <h2>http://git.openstack.org/cgit/openstack/ansible-role-cloud-launcher</h2>
+      <pre>
+profiles:
+  - name: admin-clouds
+    flavors:
+      - name: aoclcompany.xlarge
+        ram: 128
+        vcpus: 1
+  - name: ops
+    images:
+      - name: ubuntu-trusty
+        filename: /home/ubuntu/trusty-server-cloudimg-amd64-disk1.img
+  - name: bootstrap-keypair
+    keypairs:
+      - name: bootstrap-key
+        public_key_file: /home/ubuntu/.ssh/id_rsa.pub
+clouds:
+  - name: awesomecloud
+    profiles:
+      - admin-clouds
+      - bootstrap-keypair
+  - name: yaycloud-ops
+    oscc_cloud: yaycloud-opsuser
+    profiles:
+      - bootstrap-keypair
+      - ops
+      </pre>
+    </section>
+
+    <section class="slide level2">
+      <h1>nodepool</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>
+      </ul>
+    </section>
+
+    <section class="slide level2">
       <h1>OpenStack Works!</h1>
       <p class='fragment'>Why should you care?</p>
     </section>
@@ -218,7 +350,7 @@
         <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 Suriname?</li>
+        <li class='fragment'>What if you have customers in Hungary?</li>
       </ul>
     </section>
 
@@ -273,17 +405,23 @@
       <p>CityCloud: Sweden, UK</p>
       <p>Elastx: Sweden</p>
       <p>Datacentred: UK</p>
-      <p>Ultimum: Prague</p>
       <p>Enter Cloud Suite: Italy, Germany, Frankfurt</p>
       <p>Internap: Netherlands, US</p>
-      <p>Ultimum: Prague</p>
+      <p>Ultimum: Czech Republic</p>
+      <p>Zetta: Norway</p>
+    </section>
+
+    <section class="slide level2">
+      <h1>Managed Private Cloud</h1>
+      <h2>Bluebox: an IBM Company</h2>
+      <ul>
+      <li>Blue Box Dedicated: In any Softlayer Data Center Worldwide</p>
+      <li>Blue Box Local: In your data center</p>
     </section>
 
     <section class="slide level2">
-      <h1>Global Reach</h1>
-      <p>Blue Box Dedicated: In every Softlayer Data Center Worldwide</p>
-      <h3>Including right here in Amsterdam</h3>
-      <p>Blue Box Local: Same thing, but in your DC</p>
+      <h1>Private Cloud Distro</h1>
+      <h3>Not listing them - I can't possibly remember them all</h3>
     </section>
 
     <section class="slide level2">