From a0e4d6854dac23e5b10c1aaca0921f06677e0861 Mon Sep 17 00:00:00 2001 From: Paul Morie Date: Tue, 3 Jun 2014 15:47:06 -0400 Subject: [PATCH 1/4] WIP: change demo to use pmorie/geard demo-multi branch --- contrib/demo-multi/Vagrantfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/demo-multi/Vagrantfile b/contrib/demo-multi/Vagrantfile index eb0c9df2..16839a35 100644 --- a/contrib/demo-multi/Vagrantfile +++ b/contrib/demo-multi/Vagrantfile @@ -25,8 +25,9 @@ fi if [ ! -d "geard" ]; then echo "Fetching geard code" - git clone git://github.com/openshift/geard + git clone git://github.com/pmorie/geard cd geard + git checkout demo-multi 2>&1 fi if [ ! "$(ifconfig | grep eth1)" ]; then From 57da997dd9a569e120a0931c1f1cc63293f2eb53 Mon Sep 17 00:00:00 2001 From: Paul Morie Date: Tue, 3 Jun 2014 20:07:45 -0400 Subject: [PATCH 2/4] wip multi-host workaround --- contrib/demo-multi/setup-multi.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/contrib/demo-multi/setup-multi.sh b/contrib/demo-multi/setup-multi.sh index ec233963..e28f4210 100755 --- a/contrib/demo-multi/setup-multi.sh +++ b/contrib/demo-multi/setup-multi.sh @@ -20,9 +20,15 @@ fi $base/teardown-multi.sh -gear deploy $base/deploy_parks_map.json localhost localhost 192.168.205.11 192.168.205.11 localhost -gear stop 192.168.205.11/parks-backend-{2,3} +#gear deploy $base/deploy_parks_map.json 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/" +gear install -p "27017:4003" openshift/centos-mongodb --start +gear install -p "3000:4002" -n "127.0.0.1:27017:localhost:4003" parks-map-app parks-backend-1 +gear install -p "8080:14000" -p "192.168.1.1:8080:localhost:4002,129.168.1.2:8080:192.168.205.11:4002,129.168.1.2:8080:192.168.205.11:4003" parks-lb-1 +gear install -p "3000:4002" -p "127.0.0.1:27017:192.168.205.10:4003" atomic-2/parks-backend-2 +gear install -p "3000:4003" -p "127.0.0.1:27017:192.168.205.10:4003" atomic-2/parks-backend-3 + +$base/wait_for_url.sh "http://localhost:4003/" 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 e2df31d1f0bf5c78d26ec38dd6e21b89e32519a0 Mon Sep 17 00:00:00 2001 From: Paul Morie Date: Tue, 3 Jun 2014 23:06:06 -0400 Subject: [PATCH 3/4] wip: demo --- contrib/demo-multi/db-import.sh | 3 +++ contrib/demo-multi/setup-multi.sh | 26 +++++++++++++++++++------- 2 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 contrib/demo-multi/db-import.sh diff --git a/contrib/demo-multi/db-import.sh b/contrib/demo-multi/db-import.sh new file mode 100644 index 00000000..6ec0361d --- /dev/null +++ b/contrib/demo-multi/db-import.sh @@ -0,0 +1,3 @@ +#!/bin/sh -x + +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-multi/setup-multi.sh b/contrib/demo-multi/setup-multi.sh index e28f4210..11af9af9 100755 --- a/contrib/demo-multi/setup-multi.sh +++ b/contrib/demo-multi/setup-multi.sh @@ -23,12 +23,24 @@ $base/teardown-multi.sh #gear deploy $base/deploy_parks_map.json localhost localhost 192.168.205.11 192.168.205.11 localhost #gear stop 192.168.205.11/parks-backend-{2,3} -gear install -p "27017:4003" openshift/centos-mongodb --start -gear install -p "3000:4002" -n "127.0.0.1:27017:localhost:4003" parks-map-app parks-backend-1 -gear install -p "8080:14000" -p "192.168.1.1:8080:localhost:4002,129.168.1.2:8080:192.168.205.11:4002,129.168.1.2:8080:192.168.205.11:4003" parks-lb-1 -gear install -p "3000:4002" -p "127.0.0.1:27017:192.168.205.10:4003" atomic-2/parks-backend-2 -gear install -p "3000:4003" -p "127.0.0.1:27017:192.168.205.10:4003" atomic-2/parks-backend-3 - +gear install openshift/centos-mongodb parks-db-1 -p "27017:4003" openshift/centos-mongodb --start $base/wait_for_url.sh "http://localhost:4003/" +read + +gear install parks-map-app parks-backend-1 -p "3000:4002" -n "127.0.0.1:27017:localhost:4003" --start +$base/wait_for_url.sh "http://localhost:4002/" +read + +gear install parks-map-app atomic-2:43273/parks-backend-2 -p "3000:4002" -n "127.0.0.1:27017:192.168.205.10:4003" --start +$base/wait_for_url.sh "http://atomic-2:4002" +read + +gear install parks-map-app atomic-2:43273/parks-backend-3 -p "3000:4003" -n "127.0.0.1:27017:192.168.205.10:4003" --start +$base/wait_for_url.sh "http://atomic-2:4003" +read + +gear install openshift/centos-haproxy-simple-balancer parks-lb-1 -p "8080:14000" -n "192.168.1.1:8080:localhost:4002,192.168.1.2:8080:192.168.205.11:4002,192.168.1.3:8080:192.168.205.11:4003" --start +$base/wait_for_url.sh "http://localhost:14000" +read -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\" } );'" +$base/db-import.sh \ No newline at end of file From 1cc534ad28c37cdc680762c77da568ac3212858a Mon Sep 17 00:00:00 2001 From: Steven Citron-Pousty Date: Tue, 3 Jun 2014 20:26:25 -0700 Subject: [PATCH 4/4] some updates --- contrib/demo-multi/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/demo-multi/README.md b/contrib/demo-multi/README.md index 7d2c87c6..598f1a40 100644 --- a/contrib/demo-multi/README.md +++ b/contrib/demo-multi/README.md @@ -13,7 +13,7 @@ Host 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 + $ sudo yum -y --nogpgcheck localinstall vagrant_1.6.2_x86_64.rpm $ vagrant version Installed Version: 1.6.2 Latest Version: 1.6.2 @@ -45,7 +45,7 @@ Host setup $ git clone git://github.com/pmorie/geard $ cd geard $ git checkout demo-multi - $ cd contrib/demo + $ cd contrib/demo-multi $ cat Vagrantfile 5. Pull and start local docker registry. This will be used to serve the docker images needed for