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

Proposed by Nicolas Thomas
Status: Merged
Merged at revision: 51
Proposed branch: lp:~thomnico/orange-box-examples/cloudfoundry
Merge into: lp:orange-box-examples
Diff against target: 100 lines (+47/-20)
4 files modified
cloudfoundry/00-demo-prep.sh (+13/-4)
cloudfoundry/01-deploy.sh (+26/-2)
cloudfoundry/README (+8/-3)
cloudfoundry/cloudfoundry-ob.yaml (+0/-11)
To merge this branch: bzr merge lp:~thomnico/orange-box-examples/cloudfoundry
Reviewer Review Type Date Requested Status
Darryl Weaver Pending
Review via email: mp+239797@code.launchpad.net
To post a comment you must log in.
52. By Nicolas Thomas

Typo

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
33
4set -e4set -e
55
6mkdir -p trusty6CHARM="trusty/cloudfoundry"
77
8#Grab the cloudfoundry charm to the local charm repo8 if [ -d $CHARM ]
9bzr branch lp:~cf-charmers/charms/trusty/cloudfoundry/trunk trusty/cloudfoudry9 then
10 cd $CHARM
11 bzr pull
12 cd ..
13 else
14 mkdir -p trusty
15 bzr branch lp:~cf-charmers/charms/trusty/cloudfoundry/trunk $CHARM
16 fi
1017
11#Install the cloud foundry client18#Install the cloud foundry client
12wget http://go-cli.s3-website-us-east-1.amazonaws.com/releases/latest/cf-cli_amd64.deb && sudo dpkg -i cf-cli_amd64.deb19
20PKGS="cf-cli"
21dpkg -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 )
1322
=== 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 @@
33
4set -e4set -e
55
6juju set-constraints tags=6juju set-constraints mem=2048
7juju-deployer -c cloudfoundry-ob.yaml7JUJU_TYPE=`cat ${JUJU_HOME:-~/.juju}/environments/$(juju switch).jenv|grep type|awk '{print $2;}'`
8
9export ADMIN_PASS=`cat ${JUJU_HOME:-~/.juju}/environments/$(juju switch).jenv|grep admin-secret|awk '{print $2;}'`
10 cat << EOF > cf-bundle.yaml
11cloudfoundry:
12 series: trusty
13 services:
14 cloudfoundry:
15 branch: trusty/cloudfoundry
16 constraints: mem=2048
17 options:
18 admin_secret: $ADMIN_PASS
19 placement: ${1:-dense}
20 cf_version: latest
21EOF
22
23
24export JUJU_REPOSITORY=$PWD
25juju-deployer -c cf-bundle.yaml
26
27
28## need to IP or dns of the domain but need to know haproxy IP to do so
29API_IP=`juju-pprint |grep haproxy |awk '{ print $3 }' |xargs dig +short`
30juju set cloudfoundry domain=$API_IP.xip.io
831
9echo "Deployment completed"32echo "Deployment completed"
33echo "run cflogin in a few minutes"
1034
=== 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 @@
13This will first deploy the cloudfoundry orchestration charm, which then deploys all the CF services.13This will first deploy the cloudfoundry orchestration charm, which then deploys all the CF services.
14This will look messy in the GUI as it lays them out in a single line.14This will look messy in the GUI as it lays them out in a single line.
1515
16TODO:16Once it is done run:
17Once login problem is solved, create app deployment script.17cflogin
1818
19If command not found you need to source:
20source trusty/cloudfoundry/helpers.sh
21
22For more details READ:
23 trusty/cloudfoundry/README.rst
1924
=== 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 @@
1cloudfoundry:
2 series: trusty
3 services:
4 cloudfoundry:
5 branch: lp:~cf-charmers/charms/trusty/cloudfoundry/trunk
6 constraints: mem=2048
7 options:
8 admin_secret: admin
9 placement: dense
10 cf_version: latest
11

Subscribers

People subscribed via source and target branches