Merge lp:~thomnico/orange-box-examples/cloudfoundry into lp:orange-box-examples

[Nicolas Thomas]

[lp:~thomnico/orange-box-examples/cloudfoundry]

52. By Nicolas Thomas on 2014-10-28

Typo

=== modified file 'cloudfoundry/00-demo-prep.sh'
--- cloudfoundry/00-demo-prep.sh	2014-10-23 15:55:08 +0000
+++ cloudfoundry/00-demo-prep.sh	2014-10-28 09:08:09 +0000
@@ -3,10 +3,19 @@
 
 set -e
 
-mkdir -p trusty
+CHARM="trusty/cloudfoundry"
 
-#Grab the cloudfoundry charm to the local charm repo
-bzr branch lp:~cf-charmers/charms/trusty/cloudfoundry/trunk trusty/cloudfoudry
+    if [ -d $CHARM ] 
+    then
+	cd $CHARM
+	bzr pull
+	cd ..
+    else
+	mkdir -p trusty
+	bzr branch lp:~cf-charmers/charms/trusty/cloudfoundry/trunk $CHARM
+    fi
 
 #Install the cloud foundry client
-wget http://go-cli.s3-website-us-east-1.amazonaws.com/releases/latest/cf-cli_amd64.deb && sudo dpkg -i cf-cli_amd64.deb
+
+PKGS="cf-cli"
+dpkg -l $PKGS > /dev/null || (wget http://go-cli.s3-website-us-east-1.amazonaws.com/releases/latest/cf-cli_amd64.deb && sudo dpkg -i cf-cli_amd64.deb )

=== modified file 'cloudfoundry/01-deploy.sh'
--- cloudfoundry/01-deploy.sh	2014-10-23 15:55:08 +0000
+++ cloudfoundry/01-deploy.sh	2014-10-28 09:08:09 +0000
@@ -3,7 +3,31 @@
 
 set -e
 
-juju set-constraints tags=
-juju-deployer -c cloudfoundry-ob.yaml
+juju set-constraints mem=2048
+JUJU_TYPE=`cat ${JUJU_HOME:-~/.juju}/environments/$(juju switch).jenv|grep type|awk '{print $2;}'`
+
+export ADMIN_PASS=`cat ${JUJU_HOME:-~/.juju}/environments/$(juju switch).jenv|grep admin-secret|awk '{print $2;}'`
+    cat << EOF > cf-bundle.yaml
+cloudfoundry:
+    series: trusty
+    services:
+        cloudfoundry:
+            branch: trusty/cloudfoundry
+            constraints: mem=2048
+            options:
+                admin_secret: $ADMIN_PASS
+                placement: ${1:-dense}
+                cf_version: latest
+EOF
+
+
+export JUJU_REPOSITORY=$PWD
+juju-deployer -c cf-bundle.yaml
+    
+
+## need to IP or dns of the domain but need to know haproxy IP to do so
+API_IP=`juju-pprint |grep haproxy |awk '{ print $3 }' |xargs dig +short`
+juju set cloudfoundry  domain=$API_IP.xip.io
 
 echo "Deployment completed"
+echo "run cflogin in a few minutes"

=== modified file 'cloudfoundry/README'
--- cloudfoundry/README	2014-10-23 15:55:08 +0000
+++ cloudfoundry/README	2014-10-28 09:08:09 +0000
@@ -13,6 +13,11 @@
 This will first deploy the cloudfoundry orchestration charm, which then deploys all the CF services.
 This will look messy in the GUI as it lays them out in a single line.
 
-TODO:
-Once login problem is solved, create app deployment script.
-
+Once it is done run:
+cflogin
+
+If command not found you need to source:
+source trusty/cloudfoundry/helpers.sh
+
+For more details READ:
+ trusty/cloudfoundry/README.rst

=== removed file 'cloudfoundry/cloudfoundry-ob.yaml'
--- cloudfoundry/cloudfoundry-ob.yaml	2014-10-23 15:55:08 +0000
+++ cloudfoundry/cloudfoundry-ob.yaml	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-cloudfoundry:
-    series: trusty
-    services:
-        cloudfoundry:
-            branch: lp:~cf-charmers/charms/trusty/cloudfoundry/trunk
-            constraints: mem=2048
-            options:
-                admin_secret: admin
-                placement: dense
-                cf_version: latest
-