summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2016-07-11 19:50:01 +0800
committerMonty Taylor <mordred@inaugust.com>2016-07-11 19:50:01 +0800
commit4f692e371e25fef901dbf302a6b77ebfd32ba241 (patch)
treeb4da39606cbe12d57809108e032cd0bdcf092878
parentd3398e54abd445086c01b71156ee1919cbd5c1a5 (diff)
Update for Red Hat
-rw-r--r--src/images/Logo_RH_CMYK_Default.jpgbin0 -> 76717 bytes
-rw-r--r--src/talks/fallacy.hbs16
2 files changed, 9 insertions, 7 deletions
diff --git a/src/images/Logo_RH_CMYK_Default.jpg b/src/images/Logo_RH_CMYK_Default.jpg
new file mode 100644
index 0000000..a4ce927
--- /dev/null
+++ b/src/images/Logo_RH_CMYK_Default.jpg
Binary files differ
diff --git a/src/talks/fallacy.hbs b/src/talks/fallacy.hbs
index d9c7482..ef3a5b0 100644
--- a/src/talks/fallacy.hbs
+++ b/src/talks/fallacy.hbs
@@ -9,16 +9,17 @@
9 </head> 9 </head>
10 <body> 10 <body>
11 11
12 <section id="who-am-i-ibm" class="slide level2"> 12 <section id="who-am-i-redhat" class="slide level2">
13 <h1>Who am I?</h1> 13 <h1>Who am I?</h1>
14 <img style="float:right; margin-right:24pt" src="/images/ibm-logo.png"/> 14 <img style="float:right; margin:24pt" src="/images/Logo_RH_CMYK_Default.jpg" />
15 <p> Distinguished Engineer </p> 15 <p> Office of Technology </p>
16 <p> IBM Cloud </p> 16 <p> Zuul </p>
17 <p> Ansible </p>
17 </section> 18 </section>
18 19
19 <section id="who-am-i-openstack" class="slide level2"> 20 <section id="who-am-i-openstack" class="slide level2">
20 <h1>Who am I?</h1> 21 <h1>Who am I?</h1>
21 <img style="float:right; margin-right:24pt" src="/images/openstack-cloud-software-vertical-large.png" /> 22 <img style="float:right; margin-right:24pt; width:300px; height: auto" src="/images/openstack-cloud-software-vertical-large.png" />
22 <p>Technical Committee</p> 23 <p>Technical Committee</p>
23 <p>Foundation Board of Directors</p> 24 <p>Foundation Board of Directors</p>
24 <p>Developer Infrastructure Core Team</p> 25 <p>Developer Infrastructure Core Team</p>
@@ -40,12 +41,12 @@
40 </section> 41 </section>
41 42
42 <section class="slide level2"> 43 <section class="slide level2">
43 <h1>Are you a bad person if don't write Cloud Native apps?</h1> 44 <h1>Are you a bad person if you don't write Cloud Native apps?</h1>
44 <h2 class='fragment'>no</h2> 45 <h2 class='fragment'>no</h2>
45 </section> 46 </section>
46 47
47 <section class="slide level2"> 48 <section class="slide level2">
48 <img src="/images/Slim-pickens_riding-the-bomb_enh-lores.jpg" 49 <img style="width:800px; height:auto" src="/images/Slim-pickens_riding-the-bomb_enh-lores.jpg"
49 alt="Slim Pickens Rides Bomb" /> 50 alt="Slim Pickens Rides Bomb" />
50 </section> 51 </section>
51 52
@@ -229,6 +230,7 @@
229 <h1>nodepool</h1> 230 <h1>nodepool</h1>
230 <ul> 231 <ul>
231 <li class="fragment">Cloud Native</li> 232 <li class="fragment">Cloud Native</li>
233 <li class="fragment"><small>with config files</small></li>
232 <li class="fragment">Purpose built in Python</li> 234 <li class="fragment">Purpose built in Python</li>
233 <li class="fragment">Keeps a pool of ready to go nodes</li> 235 <li class="fragment">Keeps a pool of ready to go nodes</li>
234 <li class="fragment">Multi-cloud</li> 236 <li class="fragment">Multi-cloud</li>