From 5f2c7e013741926833d612ba33d61807d28a6d90 Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Tue, 27 May 2014 15:39:49 -0400
Subject: [PATCH 01/32] Add build cmd to demo setup

---
 contrib/demo/setup.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/demo/setup.sh b/contrib/demo/setup.sh
index dd330d7d..c4152a39 100755
--- a/contrib/demo/setup.sh
+++ b/contrib/demo/setup.sh
@@ -9,6 +9,7 @@ if [ $ret -ne 0 ] || [ "$FETCH_IMAGES" != "" ]; then
   docker pull openshift/nodejs-0-10-centos
   docker tag openshift/nodejs-0-10-centos nodejs-centos
   docker pull openshift/centos-mongodb
+  gear build https://github.com/smarterclayton/fluentwebmap.git nodejs-centos parks-map-app
 fi
 
 set +x

From 714b55ed5fd5f39d036e22ee74af394593d53108 Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Wed, 28 May 2014 13:08:13 -0400
Subject: [PATCH 02/32] Demo WIP

---
 contrib/demo/Vagrantfile                     | 61 ++++++++++++++++++++
 contrib/demo/deploy_parks_map_instances.json |  4 +-
 contrib/demo/setup.sh                        |  9 ++-
 3 files changed, 70 insertions(+), 4 deletions(-)
 create mode 100644 contrib/demo/Vagrantfile

diff --git a/contrib/demo/Vagrantfile b/contrib/demo/Vagrantfile
new file mode 100644
index 00000000..8521e6de
--- /dev/null
+++ b/contrib/demo/Vagrantfile
@@ -0,0 +1,61 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  # All Vagrant configuration is done here. The most common configuration
+  # options are documented and commented below. For a complete reference,
+  # please see the online documentation at vagrantup.com.
+  config.vm.box = "atomic"
+  config.vm.provider :libvirt do |libvirt|
+    libvirt.driver = "qemu"    
+    libvirt.connect_via_ssh = false
+  end
+
+  config.vm.define "vm1", primary: true do |config|
+    config.vm.network "forwarded_port", guest: 43273, host: 43273
+    config.vm.network "forwarded_port", guest: 6060, host: 2225
+    config.vm.network "forwarded_port", guest: 14000, host: 14000
+    for i in 4000..4050
+      config.vm.network :forwarded_port, guest: i, host: i
+    end
+
+    comfig.vm.network "private_network", ip: "192.168.205.10"
+  end
+
+  config.vm.define "vm2", primary: true do |config|
+    config.vm.network "forwarded_port", guest: 43273, host: 53273
+    config.vm.network "forwarded_port", guest: 6060, host: 12225
+    config.vm.network "forwarded_port", guest: 14000, host: 24000
+    for i in 4000..4050
+      config.vm.network :forwarded_port, guest: i, host: i+10001
+    end
+
+    config.vm.network "private_network", ip: "192.168.205.11"
+  end
+
+  if ENV['GOPATH'] && ENV['GOPATH'] != ""
+    puts "Sharing GOPATH with VM"
+    gopath = File.expand_path(ENV['GOPATH'].split(/:/).last)
+    vagrantfile = File.expand_path(File.dirname(__FILE__))
+    if !vagrantfile.index(gopath)
+      puts "\nYou have GOPATH set to '#{gopath}', which geard expects to contain your geard source repository, but are running from '#{vagrantfile}' instead.\n\nSet GOPATH='' when running vagrant or move your geard repo to '#{gopath}/src/github.com/openshift/geard'."
+      exit 1
+    end
+    config.vm.synced_folder gopath, "/vagrant"
+  else
+    puts "Sharing current directory with VM"
+    config.vm.synced_folder '.', "/vagrant/", disabled: true
+    config.vm.synced_folder '.', "/vagrant/src/github.com/openshift/geard", create: true
+  end
+
+  if ENV['JUMBO'] && ENV['JUMBO'] != ""
+    config.vm.provider "virtualbox" do |v|
+      v.memory = 4096
+      v.cpus = 4
+      v.customize ["modifyvm", :id, "--cpus", "4"]
+    end
+  end
+end
diff --git a/contrib/demo/deploy_parks_map_instances.json b/contrib/demo/deploy_parks_map_instances.json
index 1ef2650d..a5f8ea74 100644
--- a/contrib/demo/deploy_parks_map_instances.json
+++ b/contrib/demo/deploy_parks_map_instances.json
@@ -88,7 +88,7 @@
       "Id": "parks-backend-2",
       "Image": "parks-map-app",
       "From": "backend",
-      "On": "localhost",
+      "On": "192.168.205.11",
       "Ports": [
         {
           "Internal": 3000,
@@ -104,7 +104,7 @@
       "Id": "parks-backend-3",
       "Image": "parks-map-app",
       "From": "backend",
-      "On": "localhost",
+      "On": "192.168.205.11",
       "Ports": [
         {
           "Internal": 3000,
diff --git a/contrib/demo/setup.sh b/contrib/demo/setup.sh
index c4152a39..f00f7dc3 100755
--- a/contrib/demo/setup.sh
+++ b/contrib/demo/setup.sh
@@ -23,8 +23,13 @@ fi
 
 $base/teardown.sh
 
-gear deploy $base/deploy_parks_map.json localhost
-gear stop localhost/parks-backend-{2,3}
+descriptor=$base/deploy_parks_map.json
+if [ "$MULTIHOST" != "" ]; then
+  descriptor=$base/deploy_parks_map_instances.json
+fi
+
+gear deploy $descriptor localhost 192.168.205.11
+gear stop 192.168.205.11/parks-backend-{2,3}
 
 $base/wait_for_url.sh "http://localhost:14000/"
 

From 4636882cab002d677d64f883cb012ae96e6f8a9f Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Wed, 28 May 2014 13:43:59 -0400
Subject: [PATCH 03/32] Update demo setup.sh

---
 contrib/demo/setup.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/contrib/demo/setup.sh b/contrib/demo/setup.sh
index f00f7dc3..adedaa11 100755
--- a/contrib/demo/setup.sh
+++ b/contrib/demo/setup.sh
@@ -9,7 +9,8 @@ if [ $ret -ne 0 ] || [ "$FETCH_IMAGES" != "" ]; then
   docker pull openshift/nodejs-0-10-centos
   docker tag openshift/nodejs-0-10-centos nodejs-centos
   docker pull openshift/centos-mongodb
-  gear build https://github.com/smarterclayton/fluentwebmap.git nodejs-centos parks-map-app
+  docker pull pmorie/parks-map-app
+  docker tag pmorie/parks-map-app parks-map-app
 fi
 
 set +x
@@ -28,9 +29,9 @@ if [ "$MULTIHOST" != "" ]; then
   descriptor=$base/deploy_parks_map_instances.json
 fi
 
-gear deploy $descriptor localhost 192.168.205.11
-gear stop 192.168.205.11/parks-backend-{2,3}
+gear deploy $descriptor localhost
+gear stop localhost/parks-backend-{2,3}
 
 $base/wait_for_url.sh "http://localhost:14000/"
 
-sudo switchns --container=parks-db-1 -- /bin/bash -c "curl https://raw.githubusercontent.com/thesteve0/fluentwebmap/master/parkcoord.json | mongoimport -d fluent -c parkpoints --type json && mongo fluent --eval 'db.parkpoints.ensureIndex( { pos : \"2d\" } );'"
\ No newline at end of file
+sudo switchns --container=parks-db-1 -- /bin/bash -c "curl https://raw.githubusercontent.com/thesteve0/fluentwebmap/master/parkcoord.json | mongoimport -d fluent -c parkpoints --type json && mongo fluent --eval 'db.parkpoints.ensureIndex( { pos : \"2d\" } );'"

From 16dec29bb58d430db18da66adecba69c36ec2129 Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Wed, 28 May 2014 15:29:22 -0400
Subject: [PATCH 04/32] Add demo instructions

---
 contrib/demo/instructions.md | 114 +++++++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 contrib/demo/instructions.md

diff --git a/contrib/demo/instructions.md b/contrib/demo/instructions.md
new file mode 100644
index 00000000..9e1212dc
--- /dev/null
+++ b/contrib/demo/instructions.md
@@ -0,0 +1,114 @@
+These instructions will take you from a clean VM* to a working dockercon demo app.  In future iterations these instructions will handle creating the VMs for demo hosts.
+
+Libvirt setup
+-------------
+
+1. Install Vagrant 1.6.2
+
+    $ wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.2_x86_64.rpm
+    $ yum -y --nogpgcheck localinstall vagrant_1.6.2_x86_64.rpm
+    $ vagrant version
+    Installed Version: 1.6.2
+    Latest Version: 1.6.2
+
+1. Setup libvirt 
+
+    $ sudo yum install @virtualization
+    $ wget http://file.rdu.redhat.com/~decarr/dockercon/libvirt-setup.sh
+    $ chmod u+x libvirt-setup.sh
+    $ sudo ./libvirt-setup.sh
+    $ sudo systemctl start libvirtd.service
+    $ sudo systemctl enable libvirtd.service
+
+1. Setup vagrant with libvirt
+
+Setup vagrant with libvirt
+
+    $ sudo yum install -y wget tree vim screen mtr nmap telnet tar git
+    $ curl -sSL https://get.rvm.io | bash -s stable
+    $ sudo yum install -y libvirt-devel libxslt-devel libxml2-devel
+    $ gem install nokogiri -v '1.5.11'
+    $ vagrant plugin install --plugin-version 0.0.16 vagrant-libvirt
+
+1.  Setup Vagrant Box and Vagrantfile
+
+    vagrant box add --name=atomic --provider=libvirt http://rcm-img06.build.bos.redhat.com/images/releases/snaps/20140522.0/vagrant/rhel-atomic-host-vagrant.box
+
+Assume you have some location to hold Vagrantfile, i.e. ~/dockercon
+
+    $ cd <dockercon>
+    $ wget https://raw.githubusercontent.com/matthicksj/vagrant-ostree-setup/master/Vagrantfile
+
+5.  Start VM
+
+    $ vagrant up --provider=libvirt
+    Bringing machine 'default' up with 'libvirt' provider...
+    ==> default: HandleBoxUrl middleware is deprecated. Use HandleBox instead.
+    ==> default: This is a bug with the provider. Please contact the creator
+    ==> default: of the provider you use to fix this.
+    ==> default: Creating image (snapshot of base box volume).
+    ==> default: Creating domain with the following settings...
+    ==> default:  -- Name:          dockercon_489e2b0ea1cb9397b6db6b1bd3a89ad8
+    ==> default:  -- Domain type:   kvm
+    ==> default:  -- Cpus:          4
+    ==> default:  -- Memory:        4096M
+    ==> default:  -- Base box:      atomic
+    ==> default:  -- Storage pool:  default
+    ==> default:  -- Image:         /var/lib/libvirt/images/dockercon_489e2b0ea1cb9397b6db6b1bd3a89ad8.img
+    ==> default:  -- Volume Cache:  default
+    ==> default: Creating shared folders metadata...
+    ==> default: Starting domain.
+    ==> default: Waiting for domain to get an IP address...
+    ==> default: Waiting for SSH to become available...
+
+If you run into issues, try the following:
+
+    $ rm -fr ./vagrant
+    $ vagrant plugin list
+
+If you have other third-party plug-ins installed, try to remove them.  In particular, we found erors when running the following plug-ins with vagrant-libvirt:
+
+    1. vagrant-aws
+    2. vagrant-openshift
+
+SSH
+
+$ vagrant ssh
+
+You can now run rpm-ostree commands, etc.
+
+You can also see the vm running by viewing in virt-manager:
+
+$ virt-manager
+
+
+Demo Setup
+----------
+
+These instructions assume that you already have a VM with geard and docker.  Before you get started:
+
+1.  Make sure that the docker and geard daemons are running.
+1.  Make sure that port `14000` on the VM is mapped to `14000` on your host machine.
+1.  Make sure that firewalld is stopped if using fedora as the OS for the VM:
+
+    sudo systemctl stop firewalld.service
+
+1.  Clone pmorie's geard for and switch to the right branch:
+
+    git clone git://github.com/pmorie/geard
+    cd geard
+    git checkout demo
+
+1.  Next, run the demo setup script:
+
+    contrib/demo/setup.sh
+
+This will install the following containers:
+
+    parks-backend-{1,2,3}
+    parks-db-1
+    parks-lb-1
+
+The setup script will leave `parks-backend-{2,3}` stopped, to be started for scale-up during the demo.  Once the script has run, you should be able to hit the demo from your host in a browser at:
+
+    http://localhost:14000

From 966f9d03e18bb639f491dd0edf41970b52d33b87 Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Wed, 28 May 2014 18:24:06 -0400
Subject: [PATCH 05/32] Tweak instructions

---
 contrib/demo/instructions.md | 116 +++++++++++++++++------------------
 1 file changed, 55 insertions(+), 61 deletions(-)

diff --git a/contrib/demo/instructions.md b/contrib/demo/instructions.md
index 9e1212dc..555b6264 100644
--- a/contrib/demo/instructions.md
+++ b/contrib/demo/instructions.md
@@ -5,82 +5,78 @@ Libvirt setup
 
 1. Install Vagrant 1.6.2
 
-    $ wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.2_x86_64.rpm
-    $ yum -y --nogpgcheck localinstall vagrant_1.6.2_x86_64.rpm
-    $ vagrant version
-    Installed Version: 1.6.2
-    Latest Version: 1.6.2
+        $ wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.2_x86_64.rpm
+        $ yum -y --nogpgcheck localinstall vagrant_1.6.2_x86_64.rpm
+        $ vagrant version
+        Installed Version: 1.6.2
+        Latest Version: 1.6.2
 
 1. Setup libvirt 
 
-    $ sudo yum install @virtualization
-    $ wget http://file.rdu.redhat.com/~decarr/dockercon/libvirt-setup.sh
-    $ chmod u+x libvirt-setup.sh
-    $ sudo ./libvirt-setup.sh
-    $ sudo systemctl start libvirtd.service
-    $ sudo systemctl enable libvirtd.service
+        $ sudo yum install @virtualization
+        $ wget http://file.rdu.redhat.com/~decarr/dockercon/libvirt-setup.sh
+        $ chmod u+x libvirt-setup.sh
+        $ sudo ./libvirt-setup.sh
+        $ sudo systemctl start libvirtd.service
+        $ sudo systemctl enable libvirtd.service
 
 1. Setup vagrant with libvirt
 
-Setup vagrant with libvirt
-
-    $ sudo yum install -y wget tree vim screen mtr nmap telnet tar git
-    $ curl -sSL https://get.rvm.io | bash -s stable
-    $ sudo yum install -y libvirt-devel libxslt-devel libxml2-devel
-    $ gem install nokogiri -v '1.5.11'
-    $ vagrant plugin install --plugin-version 0.0.16 vagrant-libvirt
+        $ sudo yum install -y wget tree vim screen mtr nmap telnet tar git
+        $ curl -sSL https://get.rvm.io | bash -s stable
+        $ sudo yum install -y libvirt-devel libxslt-devel libxml2-devel
+        $ gem install nokogiri -v '1.5.11'
+        $ vagrant plugin install --plugin-version 0.0.16 vagrant-libvirt
 
 1.  Setup Vagrant Box and Vagrantfile
 
-    vagrant box add --name=atomic --provider=libvirt http://rcm-img06.build.bos.redhat.com/images/releases/snaps/20140522.0/vagrant/rhel-atomic-host-vagrant.box
+        vagrant box add --name=atomic --provider=libvirt http://rcm-img06.build.bos.redhat.com/images/releases/snaps/20140522.0/vagrant/rhel-atomic-host-vagrant.box
 
-Assume you have some location to hold Vagrantfile, i.e. ~/dockercon
+Make a directory called `dockercon`:
 
-    $ cd <dockercon>
-    $ wget https://raw.githubusercontent.com/matthicksj/vagrant-ostree-setup/master/Vagrantfile
+        $ mkdir dockercon
+        $ cd dockercon
+        $ wget https://raw.githubusercontent.com/matthicksj/vagrant-ostree-setup/master/Vagrantfile
 
 5.  Start VM
 
-    $ vagrant up --provider=libvirt
-    Bringing machine 'default' up with 'libvirt' provider...
-    ==> default: HandleBoxUrl middleware is deprecated. Use HandleBox instead.
-    ==> default: This is a bug with the provider. Please contact the creator
-    ==> default: of the provider you use to fix this.
-    ==> default: Creating image (snapshot of base box volume).
-    ==> default: Creating domain with the following settings...
-    ==> default:  -- Name:          dockercon_489e2b0ea1cb9397b6db6b1bd3a89ad8
-    ==> default:  -- Domain type:   kvm
-    ==> default:  -- Cpus:          4
-    ==> default:  -- Memory:        4096M
-    ==> default:  -- Base box:      atomic
-    ==> default:  -- Storage pool:  default
-    ==> default:  -- Image:         /var/lib/libvirt/images/dockercon_489e2b0ea1cb9397b6db6b1bd3a89ad8.img
-    ==> default:  -- Volume Cache:  default
-    ==> default: Creating shared folders metadata...
-    ==> default: Starting domain.
-    ==> default: Waiting for domain to get an IP address...
-    ==> default: Waiting for SSH to become available...
+        $ vagrant up --provider=libvirt
+        Bringing machine 'default' up with 'libvirt' provider...
+        ==> default: HandleBoxUrl middleware is deprecated. Use HandleBox instead.
+        ==> default: This is a bug with the provider. Please contact the creator
+        ==> default: of the provider you use to fix this.
+        ==> default: Creating image (snapshot of base box volume).
+        ==> default: Creating domain with the following settings...
+        ==> default:  -- Name:          dockercon_489e2b0ea1cb9397b6db6b1bd3a89ad8
+        ==> default:  -- Domain type:   kvm
+        ==> default:  -- Cpus:          4
+        ==> default:  -- Memory:        4096M
+        ==> default:  -- Base box:      atomic
+        ==> default:  -- Storage pool:  default
+        ==> default:  -- Image:         /var/lib/libvirt/images/dockercon_489e2b0ea1cb9397b6db6b1bd3a89ad8.img
+        ==> default:  -- Volume Cache:  default
+        ==> default: Creating shared folders metadata...
+        ==> default: Starting domain.
+        ==> default: Waiting for domain to get an IP address...
+        ==> default: Waiting for SSH to become available...
 
 If you run into issues, try the following:
 
-    $ rm -fr ./vagrant
-    $ vagrant plugin list
+        $ rm -fr ./vagrant
+        $ vagrant plugin list
 
 If you have other third-party plug-ins installed, try to remove them.  In particular, we found erors when running the following plug-ins with vagrant-libvirt:
 
     1. vagrant-aws
     2. vagrant-openshift
 
-SSH
-
-$ vagrant ssh
+6. SSH
 
-You can now run rpm-ostree commands, etc.
+        $ vagrant ssh
 
-You can also see the vm running by viewing in virt-manager:
-
-$ virt-manager
+You can now run rpm-ostree commands, etc.  You can also see the vm running by viewing in virt-manager:
 
+        $ virt-manager
 
 Demo Setup
 ----------
@@ -91,24 +87,22 @@ These instructions assume that you already have a VM with geard and docker.  Bef
 1.  Make sure that port `14000` on the VM is mapped to `14000` on your host machine.
 1.  Make sure that firewalld is stopped if using fedora as the OS for the VM:
 
-    sudo systemctl stop firewalld.service
+        sudo systemctl stop firewalld.service
 
 1.  Clone pmorie's geard for and switch to the right branch:
 
-    git clone git://github.com/pmorie/geard
-    cd geard
-    git checkout demo
+        git clone git://github.com/pmorie/geard
+        cd geard
+        git checkout demo
 
 1.  Next, run the demo setup script:
 
-    contrib/demo/setup.sh
+        contrib/demo/setup.sh
 
 This will install the following containers:
 
-    parks-backend-{1,2,3}
-    parks-db-1
-    parks-lb-1
-
-The setup script will leave `parks-backend-{2,3}` stopped, to be started for scale-up during the demo.  Once the script has run, you should be able to hit the demo from your host in a browser at:
+        parks-backend-{1,2,3}
+        parks-db-1
+        parks-lb-1
 
-    http://localhost:14000
+The setup script will leave `parks-backend-{2,3}` stopped, to be started for scale-up during the demo.  Once the script has run, you should be able to hit the demo from your host in a browser at: `http://localhost:14000`

From eaec5c8f56437a585938e6f14a6d577cefc266e5 Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Wed, 28 May 2014 15:39:57 -0400
Subject: [PATCH 06/32] WIP: multi-host

---
 contrib/demo/deploy_parks_map_instances.json |   4 +-
 contrib/demo/deploy_parks_map_multihost.json | 138 +++++++++++++++++++
 contrib/demo/instructions.md                 |   2 +-
 contrib/demo/setup-multi.sh                  |  41 ++++++
 contrib/demo/setup.sh                        |   7 +-
 contrib/demo/teardown-multi.sh               |  10 ++
 6 files changed, 193 insertions(+), 9 deletions(-)
 create mode 100644 contrib/demo/deploy_parks_map_multihost.json
 create mode 100755 contrib/demo/setup-multi.sh
 create mode 100755 contrib/demo/teardown-multi.sh

diff --git a/contrib/demo/deploy_parks_map_instances.json b/contrib/demo/deploy_parks_map_instances.json
index a5f8ea74..1ef2650d 100644
--- a/contrib/demo/deploy_parks_map_instances.json
+++ b/contrib/demo/deploy_parks_map_instances.json
@@ -88,7 +88,7 @@
       "Id": "parks-backend-2",
       "Image": "parks-map-app",
       "From": "backend",
-      "On": "192.168.205.11",
+      "On": "localhost",
       "Ports": [
         {
           "Internal": 3000,
@@ -104,7 +104,7 @@
       "Id": "parks-backend-3",
       "Image": "parks-map-app",
       "From": "backend",
-      "On": "192.168.205.11",
+      "On": "localhost",
       "Ports": [
         {
           "Internal": 3000,
diff --git a/contrib/demo/deploy_parks_map_multihost.json b/contrib/demo/deploy_parks_map_multihost.json
new file mode 100644
index 00000000..a5f8ea74
--- /dev/null
+++ b/contrib/demo/deploy_parks_map_multihost.json
@@ -0,0 +1,138 @@
+{
+  "Containers": [
+    {
+      "Name": "lb",
+      "Image": "openshift/centos-haproxy-simple-balancer",
+      "PublicPorts": [
+        {
+          "Internal": 80,
+          "External": 14000
+        }
+      ],
+      "Links": [
+        {
+          "To": "backend",
+          "NonLocal": true,
+          "AliasPorts": [
+            {
+              "Internal": 3000,
+              "External": 8080
+            }
+          ]
+        }
+      ],
+      "Count": 1
+    },
+    {
+      "Name": "backend",
+      "Image": "parks-map-app",
+      "PublicPorts": [
+        {
+          "Internal": 3000
+        }
+      ],
+      "Links": [
+        {
+          "To": "db",
+          "AliasPorts": [
+            {
+              "Internal": 27017
+            }
+          ]
+        }
+      ],
+      "Count": 3
+    },
+    {
+      "Name": "db",
+      "Image": "openshift/centos-mongodb",
+      "PublicPorts": [
+        {
+          "Internal": 27017
+        }
+      ],
+      "Count": 1
+    }
+  ],
+  "Instances": [
+    {
+      "Id": "parks-lb-1",
+      "Image": "openshift/centos-haproxy-simple-balancer",
+      "From": "lb",
+      "On": "localhost",
+      "Ports": [
+        {
+          "Internal": 80,
+          "External": 14000,
+          "Target": {}
+        }
+      ]
+    },
+    {
+      "Id": "parks-backend-1",
+      "Image": "parks-map-app",
+      "From": "backend",
+      "On": "localhost",
+      "Ports": [
+        {
+          "Internal": 3000,
+          "External": 4002,
+          "Target": {
+            "Host": "192.168.1.1",
+            "Port": 8080
+          }
+        }
+      ]
+    },
+    {
+      "Id": "parks-backend-2",
+      "Image": "parks-map-app",
+      "From": "backend",
+      "On": "192.168.205.11",
+      "Ports": [
+        {
+          "Internal": 3000,
+          "External": 4003,
+          "Target": {
+            "Host": "192.168.1.2",
+            "Port": 8080
+          }
+        }
+      ]
+    },
+    {
+      "Id": "parks-backend-3",
+      "Image": "parks-map-app",
+      "From": "backend",
+      "On": "192.168.205.11",
+      "Ports": [
+        {
+          "Internal": 3000,
+          "External": 4004,
+          "Target": {
+            "Host": "192.168.1.3",
+            "Port": 8080
+          }
+        }
+      ]
+    },
+    {
+      "Id": "parks-db-1",
+      "Image": "openshift/centos-mongodb",
+      "From": "db",
+      "On": "localhost",
+      "Ports": [
+        {
+          "Internal": 27017,
+          "External": 4005,
+          "Target": {
+            "Host": "127.0.0.1",
+            "Port": 27017
+          }
+        }
+      ]
+    }
+  ],
+  "IdPrefix": "parks-",
+  "RandomizeIds": false
+}
diff --git a/contrib/demo/instructions.md b/contrib/demo/instructions.md
index 555b6264..fb01075e 100644
--- a/contrib/demo/instructions.md
+++ b/contrib/demo/instructions.md
@@ -1,4 +1,4 @@
-These instructions will take you from a clean VM* to a working dockercon demo app.  In future iterations these instructions will handle creating the VMs for demo hosts.
+These instructions will take you from a clean VM* to a working demo app.  In future iterations these instructions will handle creating the VMs for demo hosts.
 
 Libvirt setup
 -------------
diff --git a/contrib/demo/setup-multi.sh b/contrib/demo/setup-multi.sh
new file mode 100755
index 00000000..f014769e
--- /dev/null
+++ b/contrib/demo/setup-multi.sh
@@ -0,0 +1,41 @@
+#!/bin/sh -x
+
+base=$(dirname $0)
+
+id=$(docker inspect --format="{{.id}}" openshift/centos-haproxy-simple-balancer)
+ret=$?
+if [ $ret -ne 0 ] || [ "$FETCH_IMAGES" != "" ]; then
+  docker pull openshift/centos-haproxy-simple-balancer
+  docker pull openshift/nodejs-0-10-centos
+  docker tag openshift/nodejs-0-10-centos nodejs-centos
+  docker pull openshift/centos-mongodb
+  docker pull pmorie/parks-map-app
+  docker tag pmorie/parks-map-app parks-map-app
+fi
+
+set +x
+
+units=$(curl -q http://localhost:43273/containers)
+ret=$?
+if [ $ret -ne 0 ]; then
+  echo "gear daemon not responding, make sure the service is running and retry."
+  exit 1
+fi
+
+units=$(curl -q http://192.168.205.11:43273/containers)
+ret=$?
+if [ $ret -ne 0 ]; then
+  echo "gear daemon on vm2 not responding, make sure the service is running and retry."
+  exit 1
+fi
+
+$base/teardown-multi.sh
+
+descriptor=$base/deploy_parks_map_multihost.json
+
+gear deploy $descriptor localhost 192.168.205.11
+gear stop 192.168.205.11/parks-backend-{2,3}
+
+$base/wait_for_url.sh "http://localhost:14000/"
+
+sudo switchns --container=parks-db-1 -- /bin/bash -c "curl https://raw.githubusercontent.com/thesteve0/fluentwebmap/master/parkcoord.json | mongoimport -d fluent -c parkpoints --type json && mongo fluent --eval 'db.parkpoints.ensureIndex( { pos : \"2d\" } );'"
diff --git a/contrib/demo/setup.sh b/contrib/demo/setup.sh
index adedaa11..24058d31 100755
--- a/contrib/demo/setup.sh
+++ b/contrib/demo/setup.sh
@@ -24,12 +24,7 @@ fi
 
 $base/teardown.sh
 
-descriptor=$base/deploy_parks_map.json
-if [ "$MULTIHOST" != "" ]; then
-  descriptor=$base/deploy_parks_map_instances.json
-fi
-
-gear deploy $descriptor localhost
+gear deploy $base/deploy_parks_map.json localhost
 gear stop localhost/parks-backend-{2,3}
 
 $base/wait_for_url.sh "http://localhost:14000/"
diff --git a/contrib/demo/teardown-multi.sh b/contrib/demo/teardown-multi.sh
new file mode 100755
index 00000000..725b347b
--- /dev/null
+++ b/contrib/demo/teardown-multi.sh
@@ -0,0 +1,10 @@
+#!/bin/sh -x
+
+base=$(dirname $0)
+
+gear stop --with=$base/deploy_parks_map_multihost.json
+gear delete --with=$base/deploy_parks_map_multihost.json
+
+docker rm parks-db-1-data
+
+sudo du -s -h /var/lib/docker/vfs/dir

From a60c5f301919bb004c58a5be47d9e61e73ff6af2 Mon Sep 17 00:00:00 2001
From: derekwaynecarr <decarr@redhat.com>
Date: Wed, 28 May 2014 15:36:06 -0500
Subject: [PATCH 07/32] Derek WIP for multihost

---
 contrib/demo/Vagrantfile     | 72 +++++++++++++++++-------------------
 contrib/demo/instructions.md | 65 +++++++++++++++++++++-----------
 2 files changed, 76 insertions(+), 61 deletions(-)

diff --git a/contrib/demo/Vagrantfile b/contrib/demo/Vagrantfile
index 8521e6de..3544401a 100644
--- a/contrib/demo/Vagrantfile
+++ b/contrib/demo/Vagrantfile
@@ -1,61 +1,55 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
 
+$script = <<SCRIPT
+echo Performing required docker pulls
+docker pull openshift/centos-haproxy-simple-balancer
+docker pull openshift/nodejs-0-10-centos
+docker pull openshift/centos-mongodb
+docker pull pmorie/parks-map-app
+docker tag openshift/nodejs-0-10-centos nodejs-centos
+docker tag pmorie/parks-map-app parks-map-app
+echo Docker pulls done
+echo Fetch from github
+git clone git://github.com/pmorie/geard
+cd geard
+git checkout demo-multi
+echo Done
+SCRIPT
+
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  # All Vagrant configuration is done here. The most common configuration
-  # options are documented and commented below. For a complete reference,
-  # please see the online documentation at vagrantup.com.
   config.vm.box = "atomic"
+  config.vm.provision "shell", inline: $script
+
+  config.vm.synced_folder './', '/vagrant', type: 'rsync', disabled: true
+
+  config.vm.provider :virtualbox do |v|
+    v.memory = 4096
+    v.cpus =4
+    v.customize ["modifyvm", :id, "--cpus", "4"]
+    v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
+    v.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
+  end
+
   config.vm.provider :libvirt do |libvirt|
-    libvirt.driver = "qemu"    
+    libvirt.cpus = 4
+    libvirt.memory = 4096
+    libvirt.driver = 'kvm' # needed for kvm performance benefits!
     libvirt.connect_via_ssh = false
+    libvirt.username = 'root'
   end
 
   config.vm.define "vm1", primary: true do |config|
     config.vm.network "forwarded_port", guest: 43273, host: 43273
     config.vm.network "forwarded_port", guest: 6060, host: 2225
     config.vm.network "forwarded_port", guest: 14000, host: 14000
-    for i in 4000..4050
-      config.vm.network :forwarded_port, guest: i, host: i
-    end
-
-    comfig.vm.network "private_network", ip: "192.168.205.10"
+    config.vm.network "private_network", ip: "192.168.205.10"
   end
 
   config.vm.define "vm2", primary: true do |config|
     config.vm.network "forwarded_port", guest: 43273, host: 53273
     config.vm.network "forwarded_port", guest: 6060, host: 12225
     config.vm.network "forwarded_port", guest: 14000, host: 24000
-    for i in 4000..4050
-      config.vm.network :forwarded_port, guest: i, host: i+10001
-    end
-
     config.vm.network "private_network", ip: "192.168.205.11"
   end
 
-  if ENV['GOPATH'] && ENV['GOPATH'] != ""
-    puts "Sharing GOPATH with VM"
-    gopath = File.expand_path(ENV['GOPATH'].split(/:/).last)
-    vagrantfile = File.expand_path(File.dirname(__FILE__))
-    if !vagrantfile.index(gopath)
-      puts "\nYou have GOPATH set to '#{gopath}', which geard expects to contain your geard source repository, but are running from '#{vagrantfile}' instead.\n\nSet GOPATH='' when running vagrant or move your geard repo to '#{gopath}/src/github.com/openshift/geard'."
-      exit 1
-    end
-    config.vm.synced_folder gopath, "/vagrant"
-  else
-    puts "Sharing current directory with VM"
-    config.vm.synced_folder '.', "/vagrant/", disabled: true
-    config.vm.synced_folder '.', "/vagrant/src/github.com/openshift/geard", create: true
-  end
-
-  if ENV['JUMBO'] && ENV['JUMBO'] != ""
-    config.vm.provider "virtualbox" do |v|
-      v.memory = 4096
-      v.cpus = 4
-      v.customize ["modifyvm", :id, "--cpus", "4"]
-    end
-  end
 end
diff --git a/contrib/demo/instructions.md b/contrib/demo/instructions.md
index fb01075e..26365312 100644
--- a/contrib/demo/instructions.md
+++ b/contrib/demo/instructions.md
@@ -28,15 +28,17 @@ Libvirt setup
         $ gem install nokogiri -v '1.5.11'
         $ vagrant plugin install --plugin-version 0.0.16 vagrant-libvirt
 
-1.  Setup Vagrant Box and Vagrantfile
+1.  Setup Vagrant Box and review Vagrantfile
 
         vagrant box add --name=atomic --provider=libvirt http://rcm-img06.build.bos.redhat.com/images/releases/snaps/20140522.0/vagrant/rhel-atomic-host-vagrant.box
 
-Make a directory called `dockercon`:
+Assume you have some location to hold Vagrantfile, i.e. ~/dockercon
 
-        $ mkdir dockercon
-        $ cd dockercon
-        $ wget https://raw.githubusercontent.com/matthicksj/vagrant-ostree-setup/master/Vagrantfile
+    $ git clone git://github.com/pmorie/geard
+    $ cd geard
+    $ git checkout demo-multi
+    $ cd contrib/demo
+    $ cat Vagrantfile
 
 5.  Start VM
 
@@ -70,13 +72,35 @@ If you have other third-party plug-ins installed, try to remove them.  In partic
     1. vagrant-aws
     2. vagrant-openshift
 
-6. SSH
+Be patient.
 
-        $ vagrant ssh
+This will bring up two vm instances: vm1 and vm2
 
-You can now run rpm-ostree commands, etc.  You can also see the vm running by viewing in virt-manager:
+The provisioner on the initial vagrant up will fetch all required docker images to support the demo, and git clone required content.
 
-        $ virt-manager
+SSH
+
+Validate all is good.
+
+$ vagrant ssh vm1
+$ docker images
+$ cd geard
+$ git branch
+* demo-multi
+master
+
+$ vagrant ssh vm2
+$ docker images
+* demo-multi
+master
+
+You can now run rpm-ostree commands, etc.
+
+You can also see the vm running by viewing in virt-manager:
+
+$ virt-manager
+
+You should see both instances running.
 
 Demo Setup
 ----------
@@ -87,22 +111,19 @@ These instructions assume that you already have a VM with geard and docker.  Bef
 1.  Make sure that port `14000` on the VM is mapped to `14000` on your host machine.
 1.  Make sure that firewalld is stopped if using fedora as the OS for the VM:
 
-        sudo systemctl stop firewalld.service
-
-1.  Clone pmorie's geard for and switch to the right branch:
-
-        git clone git://github.com/pmorie/geard
-        cd geard
-        git checkout demo
+    sudo systemctl stop firewalld.service
 
 1.  Next, run the demo setup script:
-
-        contrib/demo/setup.sh
+    
+    cd geard
+    contrib/demo/setup-multi.sh
 
 This will install the following containers:
 
-        parks-backend-{1,2,3}
-        parks-db-1
-        parks-lb-1
+    parks-backend-{1,2,3}
+    parks-db-1
+    parks-lb-1
+
+The setup script will leave `parks-backend-{2,3}` stopped, to be started for scale-up during the demo.  Once the script has run, you should be able to hit the demo from your host in a browser at:
 
-The setup script will leave `parks-backend-{2,3}` stopped, to be started for scale-up during the demo.  Once the script has run, you should be able to hit the demo from your host in a browser at: `http://localhost:14000`
+    http://localhost:14000

From 62de2bb1118ae7b0115958c59fbb05200f2e4865 Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Wed, 28 May 2014 22:53:45 -0400
Subject: [PATCH 08/32] Change provisioner script to hit a docker registry on
 the host

---
 contrib/demo/Vagrantfile     | 23 ++++++++++++++++-------
 contrib/demo/instructions.md |  7 ++++++-
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/contrib/demo/Vagrantfile b/contrib/demo/Vagrantfile
index 3544401a..613cee14 100644
--- a/contrib/demo/Vagrantfile
+++ b/contrib/demo/Vagrantfile
@@ -1,15 +1,24 @@
 VAGRANTFILE_API_VERSION = "2"
 
+# TODO: add determination of where a registry is available on the host - fall back to public index if not
 $script = <<SCRIPT
 echo Performing required docker pulls
-docker pull openshift/centos-haproxy-simple-balancer
-docker pull openshift/nodejs-0-10-centos
-docker pull openshift/centos-mongodb
-docker pull pmorie/parks-map-app
+gateway=`netstat -rn | grep "^0.0.0.0 " | cut -d " " -f10`
+docker pull $gateway:5000/openshift/centos-haproxy-simple-balancer
+docker tag $gateway:5000/openshift/centos-haproxy-simple-balancer openshift/centos-haproxy-simple-balancer
+
+docker pull $gateway:5000/openshift/nodejs-0-10-centos
+docker tag $gateway:5000/openshift/nodejs-0-10-centos openshift/nodejs-0-10-centos
 docker tag openshift/nodejs-0-10-centos nodejs-centos
-docker tag pmorie/parks-map-app parks-map-app
-echo Docker pulls done
-echo Fetch from github
+
+docker pull $gateway:5000/openshift/centos-mongodb
+docker tag $gateway:5000/openshift/centos-mongodb openshift/centos-mongodb
+
+docker pull $gateway:5000/openshift/parks-map-app
+docker tag $gateway:5000/openshift/parks-map-app openshift/parks-map-app
+docker tag openshift/parks-map-app parks-map-app
+
+echo Fetching geard code from github
 git clone git://github.com/pmorie/geard
 cd geard
 git checkout demo-multi
diff --git a/contrib/demo/instructions.md b/contrib/demo/instructions.md
index 26365312..133e53d8 100644
--- a/contrib/demo/instructions.md
+++ b/contrib/demo/instructions.md
@@ -40,7 +40,12 @@ Assume you have some location to hold Vagrantfile, i.e. ~/dockercon
     $ cd contrib/demo
     $ cat Vagrantfile
 
-5.  Start VM
+1.  Pull and start local docker registry
+
+        $ docker pull pmorie/geard-demo-registry
+        $ docker run -p 5000:5000 pmorie/geard-demo-registry
+
+1.  Start VMs
 
         $ vagrant up --provider=libvirt
         Bringing machine 'default' up with 'libvirt' provider...

From a72ada4ef7777c4d517fdda46b04cf609f88e155 Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Thu, 29 May 2014 00:09:46 -0400
Subject: [PATCH 09/32] Tweak instructions

---
 contrib/demo/instructions.md | 93 ++++++++++++++++++------------------
 1 file changed, 46 insertions(+), 47 deletions(-)

diff --git a/contrib/demo/instructions.md b/contrib/demo/instructions.md
index 133e53d8..da8d9d56 100644
--- a/contrib/demo/instructions.md
+++ b/contrib/demo/instructions.md
@@ -1,9 +1,9 @@
-These instructions will take you from a clean VM* to a working demo app.  In future iterations these instructions will handle creating the VMs for demo hosts.
+These instructions will take you from a clean VM* to a working demo app.
 
 Libvirt setup
 -------------
 
-1. Install Vagrant 1.6.2
+1.  Install Vagrant 1.6.2
 
         $ wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.2_x86_64.rpm
         $ yum -y --nogpgcheck localinstall vagrant_1.6.2_x86_64.rpm
@@ -11,7 +11,7 @@ Libvirt setup
         Installed Version: 1.6.2
         Latest Version: 1.6.2
 
-1. Setup libvirt 
+2.  Setup libvirt 
 
         $ sudo yum install @virtualization
         $ wget http://file.rdu.redhat.com/~decarr/dockercon/libvirt-setup.sh
@@ -20,7 +20,7 @@ Libvirt setup
         $ sudo systemctl start libvirtd.service
         $ sudo systemctl enable libvirtd.service
 
-1. Setup vagrant with libvirt
+3. Setup vagrant with libvirt
 
         $ sudo yum install -y wget tree vim screen mtr nmap telnet tar git
         $ curl -sSL https://get.rvm.io | bash -s stable
@@ -28,24 +28,24 @@ Libvirt setup
         $ gem install nokogiri -v '1.5.11'
         $ vagrant plugin install --plugin-version 0.0.16 vagrant-libvirt
 
-1.  Setup Vagrant Box and review Vagrantfile
+4.  Setup Vagrant Box and review Vagrantfile
 
         vagrant box add --name=atomic --provider=libvirt http://rcm-img06.build.bos.redhat.com/images/releases/snaps/20140522.0/vagrant/rhel-atomic-host-vagrant.box
 
-Assume you have some location to hold Vagrantfile, i.e. ~/dockercon
+    Clone pmorie's fork and check out the `multi-demo` branch:
 
-    $ git clone git://github.com/pmorie/geard
-    $ cd geard
-    $ git checkout demo-multi
-    $ cd contrib/demo
-    $ cat Vagrantfile
+        $ git clone git://github.com/pmorie/geard
+        $ cd geard
+        $ git checkout demo-multi
+        $ cd contrib/demo
+        $ cat Vagrantfile
 
-1.  Pull and start local docker registry
+5.  Pull and start local docker registry
 
         $ docker pull pmorie/geard-demo-registry
         $ docker run -p 5000:5000 pmorie/geard-demo-registry
 
-1.  Start VMs
+6.  Start VMs
 
         $ vagrant up --provider=libvirt
         Bringing machine 'default' up with 'libvirt' provider...
@@ -67,45 +67,42 @@ Assume you have some location to hold Vagrantfile, i.e. ~/dockercon
         ==> default: Waiting for domain to get an IP address...
         ==> default: Waiting for SSH to become available...
 
-If you run into issues, try the following:
+    If you run into issues, try the following:
 
         $ rm -fr ./vagrant
         $ vagrant plugin list
 
-If you have other third-party plug-ins installed, try to remove them.  In particular, we found erors when running the following plug-ins with vagrant-libvirt:
+    If you have other third-party plug-ins installed, try to remove them.  In particular, we found erors when running the following plug-ins with vagrant-libvirt:
 
-    1. vagrant-aws
-    2. vagrant-openshift
+    1.  vagrant-aws
+    2.  vagrant-openshift
 
-Be patient.
+    Be patient. This will bring up two vm instances: `vm1` and `vm2`.  The provisioner on the 
+    initial vagrant up will fetch all required docker images to support the  demo from the local
+    registry, and git clone required content.
 
-This will bring up two vm instances: vm1 and vm2
+7.  SSH access
 
-The provisioner on the initial vagrant up will fetch all required docker images to support the demo, and git clone required content.
+    Validate that you can reach the VMs with ssh:
 
-SSH
+        $ vagrant ssh vm1
+        $ docker images
+        $ cd geard
+        $ git branch
+        * demo-multi
+          master
 
-Validate all is good.
+        $ vagrant ssh vm2
+        $ docker images
+        * demo-multi
+          master
 
-$ vagrant ssh vm1
-$ docker images
-$ cd geard
-$ git branch
-* demo-multi
-master
+    You can now run rpm-ostree commands, etc.  You can also see the vm running by viewing in 
+    virt-manager:
 
-$ vagrant ssh vm2
-$ docker images
-* demo-multi
-master
+        $ virt-manager
 
-You can now run rpm-ostree commands, etc.
-
-You can also see the vm running by viewing in virt-manager:
-
-$ virt-manager
-
-You should see both instances running.
+    You should see be able to see both instances running.
 
 Demo Setup
 ----------
@@ -116,19 +113,21 @@ These instructions assume that you already have a VM with geard and docker.  Bef
 1.  Make sure that port `14000` on the VM is mapped to `14000` on your host machine.
 1.  Make sure that firewalld is stopped if using fedora as the OS for the VM:
 
-    sudo systemctl stop firewalld.service
+        sudo systemctl stop firewalld.service
 
 1.  Next, run the demo setup script:
     
-    cd geard
-    contrib/demo/setup-multi.sh
+        cd geard
+        contrib/demo/setup-multi.sh
 
-This will install the following containers:
+    This will install the following containers:
 
-    parks-backend-{1,2,3}
-    parks-db-1
-    parks-lb-1
+        parks-backend-{1,2,3}
+        parks-db-1
+        parks-lb-1
 
-The setup script will leave `parks-backend-{2,3}` stopped, to be started for scale-up during the demo.  Once the script has run, you should be able to hit the demo from your host in a browser at:
+    The setup script will leave `parks-backend-{2,3}` stopped, to be started for scale-up during 
+    the demo.  Once the script has run, you should be able to hit the demo from your host in a 
+    browser at:
 
     http://localhost:14000

From 4967891e96b9b57224019fb29c63fb588b1b99c4 Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Thu, 29 May 2014 00:27:42 -0400
Subject: [PATCH 10/32] Tweaks II

---
 contrib/demo/instructions.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/contrib/demo/instructions.md b/contrib/demo/instructions.md
index da8d9d56..91871e28 100644
--- a/contrib/demo/instructions.md
+++ b/contrib/demo/instructions.md
@@ -1,4 +1,11 @@
-These instructions will take you from a clean VM* to a working demo app.
+demo
+====
+
+These instructions will take you through setting up vagrant and libvirt and using these tools to 
+setup and execute a geard demo.
+
+1. [Libvirt setup](#libvirt-setup)
+1. [Demo setup](#demo-setup)
 
 Libvirt setup
 -------------

From 68515d390f0404bb8c6a92b4ce03f50b95f05f5c Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Thu, 29 May 2014 00:28:16 -0400
Subject: [PATCH 11/32] Make demo instructions README

---
 contrib/demo/{instructions.md => README.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename contrib/demo/{instructions.md => README.md} (100%)

diff --git a/contrib/demo/instructions.md b/contrib/demo/README.md
similarity index 100%
rename from contrib/demo/instructions.md
rename to contrib/demo/README.md

From 4f85dc73bc4db19eb4726e8d2128976ec6d58742 Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Thu, 29 May 2014 00:32:32 -0400
Subject: [PATCH 12/32] Tweaks III

---
 contrib/demo/README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/contrib/demo/README.md b/contrib/demo/README.md
index 91871e28..c172347d 100644
--- a/contrib/demo/README.md
+++ b/contrib/demo/README.md
@@ -135,6 +135,4 @@ These instructions assume that you already have a VM with geard and docker.  Bef
 
     The setup script will leave `parks-backend-{2,3}` stopped, to be started for scale-up during 
     the demo.  Once the script has run, you should be able to hit the demo from your host in a 
-    browser at:
-
-    http://localhost:14000
+    browser at: `http://localhost:14000`

From faafaa94389839b9b46425374d757496f8b70a9f Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Thu, 29 May 2014 00:36:04 -0400
Subject: [PATCH 13/32] Tweaks IV

---
 contrib/demo/README.md | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/contrib/demo/README.md b/contrib/demo/README.md
index c172347d..af0ed0a4 100644
--- a/contrib/demo/README.md
+++ b/contrib/demo/README.md
@@ -4,10 +4,10 @@ demo
 These instructions will take you through setting up vagrant and libvirt and using these tools to 
 setup and execute a geard demo.
 
-1. [Libvirt setup](#libvirt-setup)
+1. [Host setup](#host-setup)
 1. [Demo setup](#demo-setup)
 
-Libvirt setup
+Host setup
 -------------
 
 1.  Install Vagrant 1.6.2
@@ -114,25 +114,17 @@ Libvirt setup
 Demo Setup
 ----------
 
-These instructions assume that you already have a VM with geard and docker.  Before you get started:
+Once the host is set up, you can deploy the demo containers:
 
-1.  Make sure that the docker and geard daemons are running.
-1.  Make sure that port `14000` on the VM is mapped to `14000` on your host machine.
-1.  Make sure that firewalld is stopped if using fedora as the OS for the VM:
-
-        sudo systemctl stop firewalld.service
-
-1.  Next, run the demo setup script:
-    
-        cd geard
-        contrib/demo/setup-multi.sh
+        $ cd geard
+        $ contrib/demo/setup-multi.sh
 
-    This will install the following containers:
+This will install the following containers:
 
         parks-backend-{1,2,3}
         parks-db-1
         parks-lb-1
 
-    The setup script will leave `parks-backend-{2,3}` stopped, to be started for scale-up during 
-    the demo.  Once the script has run, you should be able to hit the demo from your host in a 
-    browser at: `http://localhost:14000`
+The setup script will leave `parks-backend-{2,3}` stopped, to be started for scale-up during 
+the demo.  Once the script has run, you should be able to hit the demo from your host in a 
+browser at: `http://localhost:14000`

From 581b7defb659a4095a342098b89bafdda75cbad2 Mon Sep 17 00:00:00 2001
From: derekwaynecarr <decarr@redhat.com>
Date: Thu, 29 May 2014 10:41:00 -0400
Subject: [PATCH 14/32] Ensure private network interface is up after restart

---
 contrib/demo/README.md   | 10 ++++++++
 contrib/demo/Vagrantfile | 54 ++++++++++++++++++++++++----------------
 2 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/contrib/demo/README.md b/contrib/demo/README.md
index af0ed0a4..45ecbde1 100644
--- a/contrib/demo/README.md
+++ b/contrib/demo/README.md
@@ -111,6 +111,16 @@ Host setup
 
     You should see be able to see both instances running.
 
+8.  If you need to restart machines
+
+$ vagrant halt
+$ vagrant up --provider=libvirt && vagrant provision
+
+Note: 
+The vagrant-libvirt provider does not support vagrant up --provision flag.  The provision step is required
+to work around an issue where the private network interface is not brought up on boot by vagrant controller
+for each VM to communicate.
+
 Demo Setup
 ----------
 
diff --git a/contrib/demo/Vagrantfile b/contrib/demo/Vagrantfile
index 613cee14..8b17fb67 100644
--- a/contrib/demo/Vagrantfile
+++ b/contrib/demo/Vagrantfile
@@ -2,27 +2,39 @@ VAGRANTFILE_API_VERSION = "2"
 
 # TODO: add determination of where a registry is available on the host - fall back to public index if not
 $script = <<SCRIPT
-echo Performing required docker pulls
-gateway=`netstat -rn | grep "^0.0.0.0 " | cut -d " " -f10`
-docker pull $gateway:5000/openshift/centos-haproxy-simple-balancer
-docker tag $gateway:5000/openshift/centos-haproxy-simple-balancer openshift/centos-haproxy-simple-balancer
 
-docker pull $gateway:5000/openshift/nodejs-0-10-centos
-docker tag $gateway:5000/openshift/nodejs-0-10-centos openshift/nodejs-0-10-centos
-docker tag openshift/nodejs-0-10-centos nodejs-centos
+id=$(docker inspect --format="{{.id}}" openshift/centos-haproxy-simple-balancer)
+ret=$?
+if [ $ret -ne 0 ]; then
+  echo Performing required docker pulls
+  gateway=`netstat -rn | grep "^0.0.0.0 " | cut -d " " -f10`
+  docker pull $gateway:5000/openshift/centos-haproxy-simple-balancer
+  docker tag $gateway:5000/openshift/centos-haproxy-simple-balancer openshift/centos-haproxy-simple-balancer
 
-docker pull $gateway:5000/openshift/centos-mongodb
-docker tag $gateway:5000/openshift/centos-mongodb openshift/centos-mongodb
+  docker pull $gateway:5000/openshift/nodejs-0-10-centos
+  docker tag $gateway:5000/openshift/nodejs-0-10-centos openshift/nodejs-0-10-centos
+  docker tag openshift/nodejs-0-10-centos nodejs-centos
 
-docker pull $gateway:5000/openshift/parks-map-app
-docker tag $gateway:5000/openshift/parks-map-app openshift/parks-map-app
-docker tag openshift/parks-map-app parks-map-app
+  docker pull $gateway:5000/openshift/centos-mongodb
+  docker tag $gateway:5000/openshift/centos-mongodb openshift/centos-mongodb
 
-echo Fetching geard code from github
-git clone git://github.com/pmorie/geard
-cd geard
-git checkout demo-multi
-echo Done
+  docker pull $gateway:5000/openshift/parks-map-app
+  docker tag $gateway:5000/openshift/parks-map-app openshift/parks-map-app
+  docker tag openshift/parks-map-app parks-map-app
+fi
+
+if [ ! -d "geard" ]; then
+  echo Fetching geard code from github
+  git clone git://github.com/pmorie/geard
+  cd geard
+  git checkout demo-multi
+fi
+
+if [ ! "$(ifconfig | grep eth1)" ]; then
+  echo Enabling eth1 for private network across VMs
+  ifup eth1 2>/dev/null
+  echo Done
+fi
 SCRIPT
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
@@ -47,18 +59,18 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     libvirt.username = 'root'
   end
 
-  config.vm.define "vm1", primary: true do |config|
+  config.vm.define "vm1" do |config|
     config.vm.network "forwarded_port", guest: 43273, host: 43273
     config.vm.network "forwarded_port", guest: 6060, host: 2225
     config.vm.network "forwarded_port", guest: 14000, host: 14000
-    config.vm.network "private_network", ip: "192.168.205.10"
+    config.vm.network "private_network", ip: "192.168.205.10", libvirt__network_name: "demo"
   end
 
-  config.vm.define "vm2", primary: true do |config|
+  config.vm.define "vm2" do |config|
     config.vm.network "forwarded_port", guest: 43273, host: 53273
     config.vm.network "forwarded_port", guest: 6060, host: 12225
     config.vm.network "forwarded_port", guest: 14000, host: 24000
-    config.vm.network "private_network", ip: "192.168.205.11"
+    config.vm.network "private_network", ip: "192.168.205.11", libvirt__network_name: "demo"
   end
 
 end

From 3440a80d128a15d4ba57a160c8b9a90a29cbbb88 Mon Sep 17 00:00:00 2001
From: derekwaynecarr <decarr@redhat.com>
Date: Thu, 29 May 2014 11:05:01 -0400
Subject: [PATCH 15/32] Modify ostree repo config to disable gpg-verify

---
 contrib/demo/Vagrantfile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/contrib/demo/Vagrantfile b/contrib/demo/Vagrantfile
index 8b17fb67..c9501e58 100644
--- a/contrib/demo/Vagrantfile
+++ b/contrib/demo/Vagrantfile
@@ -35,6 +35,11 @@ if [ ! "$(ifconfig | grep eth1)" ]; then
   ifup eth1 2>/dev/null
   echo Done
 fi
+
+if [ ! "$(cat /ostree/repo/config | grep gpg-verify=false)" ]; then
+  echo Modifying ostree repo config to use gpg-verify=false
+  echo "gpg-verify=false" >> /ostree/repo/config
+fi
 SCRIPT
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|

From 297e614213d55c75e423a5e4e7feb296d1217c18 Mon Sep 17 00:00:00 2001
From: derekwaynecarr <decarr@redhat.com>
Date: Thu, 29 May 2014 13:34:40 -0400
Subject: [PATCH 16/32] Use explicit host names instead of IP for On

---
 contrib/demo/Vagrantfile                     |  6 ++++++
 contrib/demo/deploy_parks_map_multihost.json | 10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/contrib/demo/Vagrantfile b/contrib/demo/Vagrantfile
index c9501e58..554f312e 100644
--- a/contrib/demo/Vagrantfile
+++ b/contrib/demo/Vagrantfile
@@ -40,6 +40,12 @@ if [ ! "$(cat /ostree/repo/config | grep gpg-verify=false)" ]; then
   echo Modifying ostree repo config to use gpg-verify=false
   echo "gpg-verify=false" >> /ostree/repo/config
 fi
+
+if [ ! "$(cat /etc/hosts | grep vm1)" ]; then
+  echo Setting hosts for vm1 and vm2 to explicit IPs
+  echo "192.168.205.10 vm1" >> /etc/hosts
+  echo "192.168.205.11 vm2" >> /etc/hosts
+fi
 SCRIPT
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
diff --git a/contrib/demo/deploy_parks_map_multihost.json b/contrib/demo/deploy_parks_map_multihost.json
index a5f8ea74..e9a3bf76 100644
--- a/contrib/demo/deploy_parks_map_multihost.json
+++ b/contrib/demo/deploy_parks_map_multihost.json
@@ -59,7 +59,7 @@
       "Id": "parks-lb-1",
       "Image": "openshift/centos-haproxy-simple-balancer",
       "From": "lb",
-      "On": "localhost",
+      "On": "vm1",
       "Ports": [
         {
           "Internal": 80,
@@ -72,7 +72,7 @@
       "Id": "parks-backend-1",
       "Image": "parks-map-app",
       "From": "backend",
-      "On": "localhost",
+      "On": "vm1",
       "Ports": [
         {
           "Internal": 3000,
@@ -88,7 +88,7 @@
       "Id": "parks-backend-2",
       "Image": "parks-map-app",
       "From": "backend",
-      "On": "192.168.205.11",
+      "On": "vm2",
       "Ports": [
         {
           "Internal": 3000,
@@ -104,7 +104,7 @@
       "Id": "parks-backend-3",
       "Image": "parks-map-app",
       "From": "backend",
-      "On": "192.168.205.11",
+      "On": "vm2",
       "Ports": [
         {
           "Internal": 3000,
@@ -120,7 +120,7 @@
       "Id": "parks-db-1",
       "Image": "openshift/centos-mongodb",
       "From": "db",
-      "On": "localhost",
+      "On": "vm1",
       "Ports": [
         {
           "Internal": 27017,

From cd92efe535470c5b14516d3e5572ebc90a17cc32 Mon Sep 17 00:00:00 2001
From: derekwaynecarr <decarr@redhat.com>
Date: Thu, 29 May 2014 16:34:49 -0400
Subject: [PATCH 17/32] Gear deploy uses a simple in-order placement strategy

---
 contrib/demo/setup-multi.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/demo/setup-multi.sh b/contrib/demo/setup-multi.sh
index f014769e..8c3771c0 100755
--- a/contrib/demo/setup-multi.sh
+++ b/contrib/demo/setup-multi.sh
@@ -33,9 +33,10 @@ $base/teardown-multi.sh
 
 descriptor=$base/deploy_parks_map_multihost.json
 
-gear deploy $descriptor localhost 192.168.205.11
+gear deploy $descriptor localhost localhost 192.168.205.11 192.168.205.11 localhost
 gear stop 192.168.205.11/parks-backend-{2,3}
 
 $base/wait_for_url.sh "http://localhost:14000/"
 
+
 sudo switchns --container=parks-db-1 -- /bin/bash -c "curl https://raw.githubusercontent.com/thesteve0/fluentwebmap/master/parkcoord.json | mongoimport -d fluent -c parkpoints --type json && mongo fluent --eval 'db.parkpoints.ensureIndex( { pos : \"2d\" } );'"

From 23b4c9679996c8b460217eea2f3f9bc8fc0b0ac6 Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Thu, 29 May 2014 19:47:47 -0400
Subject: [PATCH 18/32] Vagrantfile / readme changes

---
 contrib/demo/README.md   | 22 ++++++++++++++--------
 contrib/demo/Vagrantfile |  2 ++
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/contrib/demo/README.md b/contrib/demo/README.md
index 45ecbde1..ea6b1451 100644
--- a/contrib/demo/README.md
+++ b/contrib/demo/README.md
@@ -79,7 +79,8 @@ Host setup
         $ rm -fr ./vagrant
         $ vagrant plugin list
 
-    If you have other third-party plug-ins installed, try to remove them.  In particular, we found erors when running the following plug-ins with vagrant-libvirt:
+    If you have other third-party plug-ins installed, try to remove them.  In particular, we found
+    errors when running the following plug-ins with vagrant-libvirt:
 
     1.  vagrant-aws
     2.  vagrant-openshift
@@ -111,15 +112,20 @@ Host setup
 
     You should see be able to see both instances running.
 
-8.  If you need to restart machines
+8.  OSTree Upgrade
 
-$ vagrant halt
-$ vagrant up --provider=libvirt && vagrant provision
+    Next, we need to update to the latest packages.  On both VMs, run the following:
 
-Note: 
-The vagrant-libvirt provider does not support vagrant up --provision flag.  The provision step is required
-to work around an issue where the private network interface is not brought up on boot by vagrant controller
-for each VM to communicate.
+        $ rpm-ostree upgrade
+
+    Then reboot the VMs:
+
+        $ vagrant halt
+        $ vagrant up --provider=libvirt && vagrant provision
+
+    Note: The `vagrant-libvirt` provider does not support the `vagrant up --provision` flag.  The 
+    provision step is required to work around an issue where the private network interface is not
+    brought up on boot by vagrant controller for each VM to communicate.
 
 Demo Setup
 ----------
diff --git a/contrib/demo/Vagrantfile b/contrib/demo/Vagrantfile
index 554f312e..f9887ab1 100644
--- a/contrib/demo/Vagrantfile
+++ b/contrib/demo/Vagrantfile
@@ -46,6 +46,8 @@ if [ ! "$(cat /etc/hosts | grep vm1)" ]; then
   echo "192.168.205.10 vm1" >> /etc/hosts
   echo "192.168.205.11 vm2" >> /etc/hosts
 fi
+
+sudo setenforce 0
 SCRIPT
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|

From f662953bd80641a8226b5f57c5e3d3aa9a851b5c Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Thu, 29 May 2014 20:25:19 -0400
Subject: [PATCH 19/32] Rename VMs

---
 contrib/demo/README.md   | 8 ++++----
 contrib/demo/Vagrantfile | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/demo/README.md b/contrib/demo/README.md
index ea6b1451..06651d4e 100644
--- a/contrib/demo/README.md
+++ b/contrib/demo/README.md
@@ -85,22 +85,22 @@ Host setup
     1.  vagrant-aws
     2.  vagrant-openshift
 
-    Be patient. This will bring up two vm instances: `vm1` and `vm2`.  The provisioner on the 
-    initial vagrant up will fetch all required docker images to support the  demo from the local
+    Be patient. This will bring up two vm instances: `atomic-1` and `atomic-2`.  The provisioner on
+    the initial vagrant up will fetch all required docker images to support the  demo from the local
     registry, and git clone required content.
 
 7.  SSH access
 
     Validate that you can reach the VMs with ssh:
 
-        $ vagrant ssh vm1
+        $ vagrant ssh atomic-1
         $ docker images
         $ cd geard
         $ git branch
         * demo-multi
           master
 
-        $ vagrant ssh vm2
+        $ vagrant ssh atomic-2
         $ docker images
         * demo-multi
           master
diff --git a/contrib/demo/Vagrantfile b/contrib/demo/Vagrantfile
index f9887ab1..e0e7f6ea 100644
--- a/contrib/demo/Vagrantfile
+++ b/contrib/demo/Vagrantfile
@@ -72,14 +72,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     libvirt.username = 'root'
   end
 
-  config.vm.define "vm1" do |config|
+  config.vm.define "atomic-1" do |config|
     config.vm.network "forwarded_port", guest: 43273, host: 43273
     config.vm.network "forwarded_port", guest: 6060, host: 2225
     config.vm.network "forwarded_port", guest: 14000, host: 14000
     config.vm.network "private_network", ip: "192.168.205.10", libvirt__network_name: "demo"
   end
 
-  config.vm.define "vm2" do |config|
+  config.vm.define "atomic-2" do |config|
     config.vm.network "forwarded_port", guest: 43273, host: 53273
     config.vm.network "forwarded_port", guest: 6060, host: 12225
     config.vm.network "forwarded_port", guest: 14000, host: 24000

From cd2bdab217b740f116938d8601396c0959fb20cc Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Thu, 29 May 2014 21:22:21 -0400
Subject: [PATCH 20/32] Minor changes to Vagrantfile

---
 contrib/demo/Vagrantfile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/contrib/demo/Vagrantfile b/contrib/demo/Vagrantfile
index e0e7f6ea..76b9fdab 100644
--- a/contrib/demo/Vagrantfile
+++ b/contrib/demo/Vagrantfile
@@ -3,7 +3,7 @@ VAGRANTFILE_API_VERSION = "2"
 # TODO: add determination of where a registry is available on the host - fall back to public index if not
 $script = <<SCRIPT
 
-id=$(docker inspect --format="{{.id}}" openshift/centos-haproxy-simple-balancer)
+id=$(docker inspect --format="{{.id}}" openshift/centos-haproxy-simple-balancer 2> /dev/null)
 ret=$?
 if [ $ret -ne 0 ]; then
   echo Performing required docker pulls
@@ -24,27 +24,27 @@ if [ $ret -ne 0 ]; then
 fi
 
 if [ ! -d "geard" ]; then
-  echo Fetching geard code from github
+  echo "Fetching geard code"
   git clone git://github.com/pmorie/geard
   cd geard
-  git checkout demo-multi
+  git checkout demo-multi 2>&1
 fi
 
 if [ ! "$(ifconfig | grep eth1)" ]; then
-  echo Enabling eth1 for private network across VMs
+  echo "Enabling eth1 for private network across VMs"
   ifup eth1 2>/dev/null
   echo Done
 fi
 
 if [ ! "$(cat /ostree/repo/config | grep gpg-verify=false)" ]; then
-  echo Modifying ostree repo config to use gpg-verify=false
+  echo "Modifying ostree repo config to use gpg-verify=false"
   echo "gpg-verify=false" >> /ostree/repo/config
 fi
 
 if [ ! "$(cat /etc/hosts | grep vm1)" ]; then
-  echo Setting hosts for vm1 and vm2 to explicit IPs
-  echo "192.168.205.10 vm1" >> /etc/hosts
-  echo "192.168.205.11 vm2" >> /etc/hosts
+  echo "Adding host entries for VMs"
+  echo "192.168.205.10 atomic-1" >> /etc/hosts
+  echo "192.168.205.11 atomic-2" >> /etc/hosts
 fi
 
 sudo setenforce 0

From b63612055bd3a2585bae2c8bb982fee58985a3bc Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Fri, 30 May 2014 08:40:11 -0400
Subject: [PATCH 21/32] Add cockpit to instructions

---
 contrib/demo/README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/contrib/demo/README.md b/contrib/demo/README.md
index 06651d4e..f71d25a7 100644
--- a/contrib/demo/README.md
+++ b/contrib/demo/README.md
@@ -127,6 +127,14 @@ Host setup
     provision step is required to work around an issue where the private network interface is not
     brought up on boot by vagrant controller for each VM to communicate.
 
+9.  Cockpit
+
+    After running `vagrant up`, cockpit should be started and available at: `http://localhost:11001`.
+    Use the following credentials:
+
+        user: root
+        pw: <empty>
+
 Demo Setup
 ----------
 

From 4947da5936064d0eafc2a9896100c19a8dfef194 Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Fri, 30 May 2014 09:40:55 -0400
Subject: [PATCH 22/32] Add shipyard instructions

---
 contrib/demo/README.md | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/contrib/demo/README.md b/contrib/demo/README.md
index f71d25a7..0e2d92b4 100644
--- a/contrib/demo/README.md
+++ b/contrib/demo/README.md
@@ -52,7 +52,12 @@ Host setup
         $ docker pull pmorie/geard-demo-registry
         $ docker run -p 5000:5000 pmorie/geard-demo-registry
 
-6.  Start VMs
+6.  Pull and start shipyard
+
+        $ docker pull shipyard/deploy
+        $ docker run -i -t -v /var/run/docker.sock:/docker.sock shipyard/deploy setup
+
+7.  Start VMs
 
         $ vagrant up --provider=libvirt
         Bringing machine 'default' up with 'libvirt' provider...
@@ -89,7 +94,7 @@ Host setup
     the initial vagrant up will fetch all required docker images to support the  demo from the local
     registry, and git clone required content.
 
-7.  SSH access
+8.  SSH access
 
     Validate that you can reach the VMs with ssh:
 
@@ -112,7 +117,7 @@ Host setup
 
     You should see be able to see both instances running.
 
-8.  OSTree Upgrade
+9.  OSTree Upgrade
 
     Next, we need to update to the latest packages.  On both VMs, run the following:
 
@@ -127,7 +132,7 @@ Host setup
     provision step is required to work around an issue where the private network interface is not
     brought up on boot by vagrant controller for each VM to communicate.
 
-9.  Cockpit
+10.  Cockpit
 
     After running `vagrant up`, cockpit should be started and available at: `http://localhost:11001`.
     Use the following credentials:

From a80d52c7db09fc9c49d5283d5e6421cc5746b228 Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Fri, 30 May 2014 11:04:16 -0400
Subject: [PATCH 23/32] Re-add cockpit stuff

---
 contrib/demo/Vagrantfile | 5 +++++
 contrib/demo/cleanup.sh  | 5 +++++
 2 files changed, 10 insertions(+)
 create mode 100644 contrib/demo/cleanup.sh

diff --git a/contrib/demo/Vagrantfile b/contrib/demo/Vagrantfile
index 76b9fdab..9d60704b 100644
--- a/contrib/demo/Vagrantfile
+++ b/contrib/demo/Vagrantfile
@@ -47,6 +47,9 @@ if [ ! "$(cat /etc/hosts | grep vm1)" ]; then
   echo "192.168.205.11 atomic-2" >> /etc/hosts
 fi
 
+echo "Starting cockpit"
+sudo systemctl start cockpit
+
 sudo setenforce 0
 SCRIPT
 
@@ -76,6 +79,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.network "forwarded_port", guest: 43273, host: 43273
     config.vm.network "forwarded_port", guest: 6060, host: 2225
     config.vm.network "forwarded_port", guest: 14000, host: 14000
+    config.vm.network "forwarded_port", guest: 1001, host: 11001
     config.vm.network "private_network", ip: "192.168.205.10", libvirt__network_name: "demo"
   end
 
@@ -83,6 +87,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.network "forwarded_port", guest: 43273, host: 53273
     config.vm.network "forwarded_port", guest: 6060, host: 12225
     config.vm.network "forwarded_port", guest: 14000, host: 24000
+    config.vm.network "forwarded_port", guest: 1001, host: 21001
     config.vm.network "private_network", ip: "192.168.205.11", libvirt__network_name: "demo"
   end
 
diff --git a/contrib/demo/cleanup.sh b/contrib/demo/cleanup.sh
new file mode 100644
index 00000000..5dadb594
--- /dev/null
+++ b/contrib/demo/cleanup.sh
@@ -0,0 +1,5 @@
+systemctl stop geard
+docker stop $(docker ps -a -q)
+docker rm $(docker ps -a -q)
+rm -fr /var/lib/containers
+systemctl start geard

From 3c53db08ddd40504b07ae4c0a28f0c56f42ac852 Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Fri, 30 May 2014 11:46:33 -0400
Subject: [PATCH 24/32] Last minute tweaks

---
 contrib/demo/README.md                       |  5 ++++-
 contrib/demo/Vagrantfile                     |  1 +
 contrib/demo/deploy_parks_map_multihost.json | 10 +++++-----
 contrib/demo/setup-multi.sh                  | 11 -----------
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/contrib/demo/README.md b/contrib/demo/README.md
index 0e2d92b4..350b824f 100644
--- a/contrib/demo/README.md
+++ b/contrib/demo/README.md
@@ -55,7 +55,10 @@ Host setup
 6.  Pull and start shipyard
 
         $ docker pull shipyard/deploy
-        $ docker run -i -t -v /var/run/docker.sock:/docker.sock shipyard/deploy setup
+        $ docker pull shipyard/redis
+        $ docker run -i -t -v /var/run/docker.sock:/docker.sock shipyard/deploy setup\
+
+    The `docker pull` commands may take quite a long time to run.
 
 7.  Start VMs
 
diff --git a/contrib/demo/Vagrantfile b/contrib/demo/Vagrantfile
index 9d60704b..2938ec15 100644
--- a/contrib/demo/Vagrantfile
+++ b/contrib/demo/Vagrantfile
@@ -45,6 +45,7 @@ if [ ! "$(cat /etc/hosts | grep vm1)" ]; then
   echo "Adding host entries for VMs"
   echo "192.168.205.10 atomic-1" >> /etc/hosts
   echo "192.168.205.11 atomic-2" >> /etc/hosts
+  echo "$gateway testrepo" >> /etc/hosts
 fi
 
 echo "Starting cockpit"
diff --git a/contrib/demo/deploy_parks_map_multihost.json b/contrib/demo/deploy_parks_map_multihost.json
index e9a3bf76..b2f12b79 100644
--- a/contrib/demo/deploy_parks_map_multihost.json
+++ b/contrib/demo/deploy_parks_map_multihost.json
@@ -59,7 +59,7 @@
       "Id": "parks-lb-1",
       "Image": "openshift/centos-haproxy-simple-balancer",
       "From": "lb",
-      "On": "vm1",
+      "On": "atomic-1",
       "Ports": [
         {
           "Internal": 80,
@@ -72,7 +72,7 @@
       "Id": "parks-backend-1",
       "Image": "parks-map-app",
       "From": "backend",
-      "On": "vm1",
+      "On": "atomic-1",
       "Ports": [
         {
           "Internal": 3000,
@@ -88,7 +88,7 @@
       "Id": "parks-backend-2",
       "Image": "parks-map-app",
       "From": "backend",
-      "On": "vm2",
+      "On": "atomic-2",
       "Ports": [
         {
           "Internal": 3000,
@@ -104,7 +104,7 @@
       "Id": "parks-backend-3",
       "Image": "parks-map-app",
       "From": "backend",
-      "On": "vm2",
+      "On": "atomic-2",
       "Ports": [
         {
           "Internal": 3000,
@@ -120,7 +120,7 @@
       "Id": "parks-db-1",
       "Image": "openshift/centos-mongodb",
       "From": "db",
-      "On": "vm1",
+      "On": "atomic-1",
       "Ports": [
         {
           "Internal": 27017,
diff --git a/contrib/demo/setup-multi.sh b/contrib/demo/setup-multi.sh
index 8c3771c0..5c585380 100755
--- a/contrib/demo/setup-multi.sh
+++ b/contrib/demo/setup-multi.sh
@@ -2,17 +2,6 @@
 
 base=$(dirname $0)
 
-id=$(docker inspect --format="{{.id}}" openshift/centos-haproxy-simple-balancer)
-ret=$?
-if [ $ret -ne 0 ] || [ "$FETCH_IMAGES" != "" ]; then
-  docker pull openshift/centos-haproxy-simple-balancer
-  docker pull openshift/nodejs-0-10-centos
-  docker tag openshift/nodejs-0-10-centos nodejs-centos
-  docker pull openshift/centos-mongodb
-  docker pull pmorie/parks-map-app
-  docker tag pmorie/parks-map-app parks-map-app
-fi
-
 set +x
 
 units=$(curl -q http://localhost:43273/containers)

From b375bbd49f141de5f5a7e36304f4d2dea317c59f Mon Sep 17 00:00:00 2001
From: Mrunal Patel <mrunalp@gmail.com>
Date: Fri, 30 May 2014 13:17:44 -0700
Subject: [PATCH 25/32] Add vagrant gem warning.

---
 contrib/demo/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/demo/README.md b/contrib/demo/README.md
index 350b824f..e71ee8b3 100644
--- a/contrib/demo/README.md
+++ b/contrib/demo/README.md
@@ -33,6 +33,7 @@ Host setup
         $ curl -sSL https://get.rvm.io | bash -s stable
         $ sudo yum install -y libvirt-devel libxslt-devel libxml2-devel
         $ gem install nokogiri -v '1.5.11'
+        # Make sure that vagrant isn't installed as a gem. If it is, then uninstall it.
         $ vagrant plugin install --plugin-version 0.0.16 vagrant-libvirt
 
 4.  Setup Vagrant Box and review Vagrantfile

From 2d1cb9e25b76982db031efd8cf8a01c084b4f39e Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Fri, 30 May 2014 16:53:38 -0400
Subject: [PATCH 26/32] Take shipyard instructions back out :)

---
 contrib/demo/README.md | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/contrib/demo/README.md b/contrib/demo/README.md
index e71ee8b3..09db645a 100644
--- a/contrib/demo/README.md
+++ b/contrib/demo/README.md
@@ -53,15 +53,7 @@ Host setup
         $ docker pull pmorie/geard-demo-registry
         $ docker run -p 5000:5000 pmorie/geard-demo-registry
 
-6.  Pull and start shipyard
-
-        $ docker pull shipyard/deploy
-        $ docker pull shipyard/redis
-        $ docker run -i -t -v /var/run/docker.sock:/docker.sock shipyard/deploy setup\
-
-    The `docker pull` commands may take quite a long time to run.
-
-7.  Start VMs
+6.  Start VMs
 
         $ vagrant up --provider=libvirt
         Bringing machine 'default' up with 'libvirt' provider...
@@ -98,7 +90,7 @@ Host setup
     the initial vagrant up will fetch all required docker images to support the  demo from the local
     registry, and git clone required content.
 
-8.  SSH access
+7.  SSH access
 
     Validate that you can reach the VMs with ssh:
 
@@ -121,7 +113,7 @@ Host setup
 
     You should see be able to see both instances running.
 
-9.  OSTree Upgrade
+8.  OSTree Upgrade
 
     Next, we need to update to the latest packages.  On both VMs, run the following:
 
@@ -136,7 +128,7 @@ Host setup
     provision step is required to work around an issue where the private network interface is not
     brought up on boot by vagrant controller for each VM to communicate.
 
-10.  Cockpit
+9.  Cockpit
 
     After running `vagrant up`, cockpit should be started and available at: `http://localhost:11001`.
     Use the following credentials:

From 1037ed18cb0c9507ab4383ec3b39c635338d3d40 Mon Sep 17 00:00:00 2001
From: derekwaynecarr <decarr@redhat.com>
Date: Fri, 30 May 2014 17:46:10 -0500
Subject: [PATCH 27/32] Set explict host-names to differentiate boxes in
 cockpit

---
 contrib/demo/Vagrantfile | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/contrib/demo/Vagrantfile b/contrib/demo/Vagrantfile
index 2938ec15..0e8cacf6 100644
--- a/contrib/demo/Vagrantfile
+++ b/contrib/demo/Vagrantfile
@@ -41,13 +41,29 @@ if [ ! "$(cat /ostree/repo/config | grep gpg-verify=false)" ]; then
   echo "gpg-verify=false" >> /ostree/repo/config
 fi
 
-if [ ! "$(cat /etc/hosts | grep vm1)" ]; then
+if [ ! "$(cat /etc/hosts | grep atomic-1)" ]; then
   echo "Adding host entries for VMs"
   echo "192.168.205.10 atomic-1" >> /etc/hosts
   echo "192.168.205.11 atomic-2" >> /etc/hosts
   echo "$gateway testrepo" >> /etc/hosts
 fi
 
+echo "Setting root password"
+passwd <<EOF
+atomic2014
+atomic2014
+EOF
+
+if [ "$1" == "atomic-1" ]; then
+  echo "Setting hostname on atomic-1"
+  hostname atomic-1
+fi
+
+if [ "$1" == "atomic-2" ]; then
+  echo "Setting hostname on atomic-2"
+  hostname atomic-2
+fi
+
 echo "Starting cockpit"
 sudo systemctl start cockpit
 
@@ -57,7 +73,6 @@ SCRIPT
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = "atomic"
   config.vm.provision "shell", inline: $script
-
   config.vm.synced_folder './', '/vagrant', type: 'rsync', disabled: true
 
   config.vm.provider :virtualbox do |v|
@@ -77,6 +92,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   config.vm.define "atomic-1" do |config|
+    config.vm.provision "shell", inline: $script, args: "atomic-1"
     config.vm.network "forwarded_port", guest: 43273, host: 43273
     config.vm.network "forwarded_port", guest: 6060, host: 2225
     config.vm.network "forwarded_port", guest: 14000, host: 14000
@@ -85,6 +101,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   config.vm.define "atomic-2" do |config|
+    config.vm.provision "shell", inline: $script, args: "atomic-2"
     config.vm.network "forwarded_port", guest: 43273, host: 53273
     config.vm.network "forwarded_port", guest: 6060, host: 12225
     config.vm.network "forwarded_port", guest: 14000, host: 24000

From ddf04ad72117756f12d6d23965d95b5d4dc7d34a Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Sun, 1 Jun 2014 13:37:25 -0400
Subject: [PATCH 28/32] Update box in demo readme and remove rpm-ostree upgrade
 step

---
 contrib/demo/README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/contrib/demo/README.md b/contrib/demo/README.md
index 09db645a..de52aab5 100644
--- a/contrib/demo/README.md
+++ b/contrib/demo/README.md
@@ -38,7 +38,7 @@ Host setup
 
 4.  Setup Vagrant Box and review Vagrantfile
 
-        vagrant box add --name=atomic --provider=libvirt http://rcm-img06.build.bos.redhat.com/images/releases/snaps/20140522.0/vagrant/rhel-atomic-host-vagrant.box
+        vagrant box add --name=atomic --provider=libvirt http://download.eng.bos.redhat.com/rcm-guest/staging/walters/images/snaps/20140531.1/vagrant-libvirt/rhel-atomic-host.box
 
     Clone pmorie's fork and check out the `multi-demo` branch:
 
@@ -113,6 +113,7 @@ Host setup
 
     You should see be able to see both instances running.
 
+<!---
 8.  OSTree Upgrade
 
     Next, we need to update to the latest packages.  On both VMs, run the following:
@@ -127,8 +128,9 @@ Host setup
     Note: The `vagrant-libvirt` provider does not support the `vagrant up --provision` flag.  The 
     provision step is required to work around an issue where the private network interface is not
     brought up on boot by vagrant controller for each VM to communicate.
+-->
 
-9.  Cockpit
+8.  Cockpit
 
     After running `vagrant up`, cockpit should be started and available at: `http://localhost:11001`.
     Use the following credentials:

From fafc3b43e4e9c7d9bf339664a4404b38c6b0b96b Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Sun, 1 Jun 2014 14:24:08 -0400
Subject: [PATCH 29/32] Fix multiple provision invocations

---
 contrib/demo/Vagrantfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/contrib/demo/Vagrantfile b/contrib/demo/Vagrantfile
index 0e8cacf6..44a71f7a 100644
--- a/contrib/demo/Vagrantfile
+++ b/contrib/demo/Vagrantfile
@@ -72,7 +72,6 @@ SCRIPT
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = "atomic"
-  config.vm.provision "shell", inline: $script
   config.vm.synced_folder './', '/vagrant', type: 'rsync', disabled: true
 
   config.vm.provider :virtualbox do |v|

From 55d87986351f8fe62fd1c57a900d03e3a374bb41 Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Sun, 1 Jun 2014 14:37:13 -0400
Subject: [PATCH 30/32] Add instructions for atomic-2 setup in cockpit

---
 contrib/demo/README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contrib/demo/README.md b/contrib/demo/README.md
index de52aab5..b7526fcc 100644
--- a/contrib/demo/README.md
+++ b/contrib/demo/README.md
@@ -136,7 +136,10 @@ Host setup
     Use the following credentials:
 
         user: root
-        pw: <empty>
+        password: atomic2014
+
+    Once you have logged into cockpit, click the 'Add server' button on the right-hand side of the
+    page.  Enter `atomic-2` for the hostname and leave `login with my current credentials` checked.
 
 Demo Setup
 ----------

From bddd41a499cf7de4ae434c313a1353d9ef8cc40b Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@gmail.com>
Date: Sun, 1 Jun 2014 14:53:07 -0400
Subject: [PATCH 31/32] Redirect stderr for provision scripts

---
 contrib/demo/Vagrantfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/demo/Vagrantfile b/contrib/demo/Vagrantfile
index 44a71f7a..0eadb11f 100644
--- a/contrib/demo/Vagrantfile
+++ b/contrib/demo/Vagrantfile
@@ -49,7 +49,7 @@ if [ ! "$(cat /etc/hosts | grep atomic-1)" ]; then
 fi
 
 echo "Setting root password"
-passwd <<EOF
+passwd 2> /dev/null <<EOF
 atomic2014
 atomic2014
 EOF

From 21d577c3c8301880c98e28edbbb01e314129eee4 Mon Sep 17 00:00:00 2001
From: Steven Citron-Pousty <scitronpousty@gmail.com>
Date: Sun, 1 Jun 2014 19:24:53 -0700
Subject: [PATCH 32/32] Update README.md

---
 contrib/demo/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/demo/README.md b/contrib/demo/README.md
index b7526fcc..47343c14 100644
--- a/contrib/demo/README.md
+++ b/contrib/demo/README.md
@@ -32,6 +32,7 @@ Host setup
         $ sudo yum install -y wget tree vim screen mtr nmap telnet tar git
         $ curl -sSL https://get.rvm.io | bash -s stable
         $ sudo yum install -y libvirt-devel libxslt-devel libxml2-devel
+        #For this to work I had to "sudo yum install ruby-dev*"
         $ gem install nokogiri -v '1.5.11'
         # Make sure that vagrant isn't installed as a gem. If it is, then uninstall it.
         $ vagrant plugin install --plugin-version 0.0.16 vagrant-libvirt