Merge lp:~mmenkhof/orange-box-examples/orange-box-examples-cleanup into lp:~kirkland/orange-box-examples/trunk

Proposed by Malte Menkhoff
Status: Needs review
Proposed branch: lp:~mmenkhof/orange-box-examples/orange-box-examples-cleanup
Merge into: lp:~kirkland/orange-box-examples/trunk
Diff against target: 137 lines (+91/-0)
8 files modified
usr/lib/orange-box/examples/app-bundles/elasticsearch/01_deploy_elasticsearch (+2/-0)
usr/lib/orange-box/examples/app-bundles/elasticsearch/02_postdeploy.sh (+9/-0)
usr/lib/orange-box/examples/app-bundles/elasticsearch/README (+6/-0)
usr/lib/orange-box/examples/app-bundles/elasticsearch/elasticsearch.yaml (+18/-0)
usr/lib/orange-box/examples/app-bundles/inkabinka/01_deploy_inkabinka (+2/-0)
usr/lib/orange-box/examples/app-bundles/inkabinka/02_postdeploy.sh (+3/-0)
usr/lib/orange-box/examples/app-bundles/inkabinka/README (+6/-0)
usr/lib/orange-box/examples/app-bundles/inkabinka/inkabinka.yaml (+45/-0)
To merge this branch: bzr merge lp:~mmenkhof/orange-box-examples/orange-box-examples-cleanup
Reviewer Review Type Date Requested Status
Dustin Kirkland  Pending
Review via email: mp+229910@code.launchpad.net

Description of the change

clean up of directories and scripts for elasticsearch and inkabinka

To post a comment you must log in.

Unmerged revisions

25. By Malte Menkhoff

clean-up`d the directory structure and files according the dweaver guideline

24. By Malte Menkhoff

mme 05082014 - added two demos: inkabinka + elasticsearch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'usr/lib/orange-box/examples/app-bundles/elasticsearch'
2=== added file 'usr/lib/orange-box/examples/app-bundles/elasticsearch/01_deploy_elasticsearch'
3--- usr/lib/orange-box/examples/app-bundles/elasticsearch/01_deploy_elasticsearch 1970-01-01 00:00:00 +0000
4+++ usr/lib/orange-box/examples/app-bundles/elasticsearch/01_deploy_elasticsearch 2014-08-07 09:17:08 +0000
5@@ -0,0 +1,2 @@
6+#!/bin/bash
7+juju-deployer -t 3600 -r 3 -c elasticsearch.yaml
8
9=== added file 'usr/lib/orange-box/examples/app-bundles/elasticsearch/02_postdeploy.sh'
10--- usr/lib/orange-box/examples/app-bundles/elasticsearch/02_postdeploy.sh 1970-01-01 00:00:00 +0000
11+++ usr/lib/orange-box/examples/app-bundles/elasticsearch/02_postdeploy.sh 2014-08-07 09:17:08 +0000
12@@ -0,0 +1,9 @@
13+#!/bin/bash
14+###########
15+set -e
16+
17+gunzip shakespeare.json.gz
18+juju scp shakespeare.json elasticsearch/0:
19+#juju ssh elasticsearch/0 "export http_proxy=http://10.14.4.1:3128 ; wget http://www.elasticsearch.org/guide/en/kibana/current/snippets/shakespeare.json"
20+juju ssh elasticsearch/0 "curl -XPUT localhost:9200/_bulk --data-binary @shakespeare.json > /dev/null"
21+juju ssh kibana/0 "cd /srv/kibana3/app/dashboards; sudo wget http://www.elasticsearch.org/guide/en/kibana/current/snippets/plays.json; sudo cp plays.json default.json; sudo /etc/init.d/nginx restart"
22
23=== added file 'usr/lib/orange-box/examples/app-bundles/elasticsearch/README'
24--- usr/lib/orange-box/examples/app-bundles/elasticsearch/README 1970-01-01 00:00:00 +0000
25+++ usr/lib/orange-box/examples/app-bundles/elasticsearch/README 2014-08-07 09:17:08 +0000
26@@ -0,0 +1,6 @@
27+Run the command:
28+01_deploy_elasticsearch to deploy elasticsearch and kibana.
29+02_postdeploy to upload shakespeare example data to elasticsearch + add a fancy dashbord to kibana.
30+
31+information:
32+this bundle can be deployed via drag&drop as well - but needs the postdeploy script to have data in it.
33
34=== added file 'usr/lib/orange-box/examples/app-bundles/elasticsearch/elasticsearch.yaml'
35--- usr/lib/orange-box/examples/app-bundles/elasticsearch/elasticsearch.yaml 1970-01-01 00:00:00 +0000
36+++ usr/lib/orange-box/examples/app-bundles/elasticsearch/elasticsearch.yaml 2014-08-07 09:17:08 +0000
37@@ -0,0 +1,18 @@
38+envExport:
39+ services:
40+ elasticsearch:
41+ charm: "cs:trusty/elasticsearch-0"
42+ num_units: 1
43+ annotations:
44+ "gui-x": "1409"
45+ "gui-y": "304.5"
46+ kibana:
47+ charm: "cs:precise/kibana-4"
48+ num_units: 1
49+ annotations:
50+ "gui-x": "1612"
51+ "gui-y": "700.5"
52+ relations:
53+ - - "elasticsearch:rest"
54+ - "kibana:rest"
55+ series: precise
56
57=== added directory 'usr/lib/orange-box/examples/app-bundles/elasticsearch/precise'
58=== added file 'usr/lib/orange-box/examples/app-bundles/elasticsearch/shakespeare.json.gz'
59Binary files usr/lib/orange-box/examples/app-bundles/elasticsearch/shakespeare.json.gz 1970-01-01 00:00:00 +0000 and usr/lib/orange-box/examples/app-bundles/elasticsearch/shakespeare.json.gz 2014-08-07 09:17:08 +0000 differ
60=== added directory 'usr/lib/orange-box/examples/app-bundles/inkabinka'
61=== added file 'usr/lib/orange-box/examples/app-bundles/inkabinka/01_deploy_inkabinka'
62--- usr/lib/orange-box/examples/app-bundles/inkabinka/01_deploy_inkabinka 1970-01-01 00:00:00 +0000
63+++ usr/lib/orange-box/examples/app-bundles/inkabinka/01_deploy_inkabinka 2014-08-07 09:17:08 +0000
64@@ -0,0 +1,2 @@
65+#!/bin/bash
66+juju-deployer -t 3600 -r 3 -c inkabinka.yaml
67
68=== added file 'usr/lib/orange-box/examples/app-bundles/inkabinka/02_postdeploy.sh'
69--- usr/lib/orange-box/examples/app-bundles/inkabinka/02_postdeploy.sh 1970-01-01 00:00:00 +0000
70+++ usr/lib/orange-box/examples/app-bundles/inkabinka/02_postdeploy.sh 2014-08-07 09:17:08 +0000
71@@ -0,0 +1,3 @@
72+#!/bin/bash
73+###########
74+juju set website content="https://github.com/marcoceppi/inky.git"
75
76=== added file 'usr/lib/orange-box/examples/app-bundles/inkabinka/README'
77--- usr/lib/orange-box/examples/app-bundles/inkabinka/README 1970-01-01 00:00:00 +0000
78+++ usr/lib/orange-box/examples/app-bundles/inkabinka/README 2014-08-07 09:17:08 +0000
79@@ -0,0 +1,6 @@
80+Run the command:
81+./01_deploy_inkabinka to deploy inkabinka.
82+./02_postdeploy.sh to change the website root as one example for the power of the inka - this can be done as well in the UI.
83+
84+information:
85+this bundle cna be deployed via drag&drop as well
86
87=== added file 'usr/lib/orange-box/examples/app-bundles/inkabinka/inkabinka.yaml'
88--- usr/lib/orange-box/examples/app-bundles/inkabinka/inkabinka.yaml 1970-01-01 00:00:00 +0000
89+++ usr/lib/orange-box/examples/app-bundles/inkabinka/inkabinka.yaml 2014-08-07 09:17:08 +0000
90@@ -0,0 +1,45 @@
91+inkabinka:
92+ services:
93+ mongodb:
94+ charm: "cs:precise/mongodb-29"
95+ num_units: 1
96+ annotations:
97+ "gui-x": "1509.6827392578125"
98+ "gui-y": "606.6281679064925"
99+ "api":
100+ charm: "cs:~hp-discover/trusty/node-app"
101+ num_units: 1
102+ annotations:
103+ "gui-x": "1366.4895792894895"
104+ "gui-y": "338.0509889514144"
105+ nginx:
106+ charm: "cs:~hp-discover/trusty/nginx"
107+ num_units: 1
108+ annotations:
109+ "gui-x": "760.5689534253543"
110+ "gui-y": "312.6845643908675"
111+ website:
112+ charm: "cs:~hp-discover/trusty/website"
113+ num_units: 0
114+ annotations:
115+ "gui-x": "1034.9820332970885"
116+ "gui-y": "317.37576886108565"
117+ "nginx-proxy":
118+ charm: "cs:~hp-discover/trusty/nginx-proxy"
119+ num_units: 1
120+ options:
121+ "default-route": /website
122+ expose: true
123+ annotations:
124+ "gui-x": "1196.837601750427"
125+ "gui-y": "12.983199873655622"
126+ relations:
127+ - - "mongodb:database"
128+ - "api:mongodb"
129+ - - "website:nginx-engine"
130+ - "nginx:web-engine"
131+ - - "api:website"
132+ - "nginx-proxy:website"
133+ - - "nginx-proxy:website"
134+ - "website:website"
135+ series: trusty
136
137=== added directory 'usr/lib/orange-box/examples/app-bundles/inkabinka/trusty'

Subscribers

People subscribed via source and target branches