1
=== modified file 'usr/lib/orange-box/examples/00-bootstrap.sh'
2
--- usr/lib/orange-box/examples/00-bootstrap.sh	2014-07-16 07:31:25 +0000
3
+++ usr/lib/orange-box/examples/00-bootstrap.sh	2014-07-24 01:23:40 +0000
4
@@ -1,12 +1,5 @@
5
1
#!/bin/bash
1
#!/bin/bash
6
2
#
2
#
17
3
# Ameet Paranjape, 2 April 2014
3
# Darryl Weaver, 21 July 2014
18
4
4
19
5
set -x
5
orange-box-bootstrap-juju
10
6
11
7
juju status && echo "Existing deployment found, exiting." && exit 0
12
8
juju bootstrap --constraints "tags=virtual" --show-log --upload-tools
13
9
juju set-constraints "tags="
14
10
juju deploy --to 0 --repository=/srv/charmstore/ local:precise/juju-gui
15
11
juju expose juju-gui
16
12
20
13
6
21
=== added file 'usr/lib/orange-box/examples/99-cleanup.sh'
22
--- usr/lib/orange-box/examples/99-cleanup.sh	1970-01-01 00:00:00 +0000
23
+++ usr/lib/orange-box/examples/99-cleanup.sh	2014-07-24 01:23:40 +0000
24
@@ -0,0 +1,4 @@
25
1
#!/bin/bash
26
2
27
3
orange-box-destroy-juju
28
4
29
0
5
30
=== modified file 'usr/lib/orange-box/examples/README'
31
--- usr/lib/orange-box/examples/README	2014-06-10 23:44:37 +0000
32
+++ usr/lib/orange-box/examples/README	2014-07-24 01:23:40 +0000
33
@@ -3,3 +3,12 @@
34
3
Each directory contains a demo for the micro cluster as well as a README 
3
Each directory contains a demo for the micro cluster as well as a README 
35
4
file on how to run the demo.  It is highly recommended to read the 
4
file on how to run the demo.  It is highly recommended to read the 
36
5
README before running a demo!
5
README before running a demo!
37
6
38
7
To bootstrap Juju run:
39
8
./00-bootstrap.sh
40
9
41
10
Then deploy a demo by reading the README and usually running:
42
11
cd demo-folder
43
12
./01-deploy.sh
44
13
45
14
Sometimes you can deploy a bundle using the Juju-gui, but there can be problems you can't see from the GUI, so please deploy complex applications using the command line.
46
6
15
47
=== removed directory 'usr/lib/orange-box/examples/app-bundles/owncloud'
48
=== removed file 'usr/lib/orange-box/examples/app-bundles/owncloud/owncloud-bundle.yaml'
49
--- usr/lib/orange-box/examples/app-bundles/owncloud/owncloud-bundle.yaml	2014-07-14 07:26:29 +0000
50
+++ usr/lib/orange-box/examples/app-bundles/owncloud/owncloud-bundle.yaml	1970-01-01 00:00:00 +0000
51
@@ -1,47 +0,0 @@
52
1
envExport: 
53
2
  services: 
54
3
    owncloud: 
55
4
      charm: "cs:precise/owncloud-13"
56
5
      num_units: 1
57
6
      options: 
58
7
        password: admin
59
8
        user: admin
60
9
      annotations: 
61
10
        "gui-x": "332"
62
11
        "gui-y": "304"
63
12
    "owncloud-mysql": 
64
13
      charm: "cs:precise/mysql-46"
65
14
      num_units: 1
66
15
      annotations: 
67
16
        "gui-x": "330"
68
17
        "gui-y": "609"
69
18
    "owncloud-phpmyadmin": 
70
19
      charm: "cs:precise/phpmyadmin-4"
71
20
      num_units: 1
72
21
      expose: true
73
22
      annotations: 
74
23
        "gui-x": "722"
75
24
        "gui-y": "607"
76
25
    "owncloud-haproxy": 
77
26
      charm: "cs:precise/haproxy-31"
78
27
      num_units: 1
79
28
      expose: true
80
29
      annotations: 
81
30
        "gui-x": "332"
82
31
        "gui-y": "18"
83
32
    "owncloud-nfs": 
84
33
      charm: "cs:precise/nfs-4"
85
34
      num_units: 1
86
35
      annotations: 
87
36
        "gui-x": "-114"
88
37
        "gui-y": "449"
89
38
  relations: 
90
39
    - - "owncloud:db"
91
40
      - "owncloud-mysql:db"
92
41
    - - "owncloud-phpmyadmin:db-admin"
93
42
      - "owncloud-mysql:db-admin"
94
43
    - - "owncloud-haproxy:reverseproxy"
95
44
      - "owncloud:website"
96
45
    - - "owncloud:shared-fs"
97
46
      - "owncloud-nfs:nfs"
98
47
  series: precise
99
48
0
100
=== removed file 'usr/lib/orange-box/examples/hadoop/00-bootstrap.sh'
101
--- usr/lib/orange-box/examples/hadoop/00-bootstrap.sh	2014-06-10 23:44:37 +0000
102
+++ usr/lib/orange-box/examples/hadoop/00-bootstrap.sh	1970-01-01 00:00:00 +0000
103
@@ -1,16 +0,0 @@
104
1
#!/bin/bash
105
2
106
3
# Remove any stale ssh known hosts
107
4
rm -f ~/.ssh/known_hosts
108
5
109
6
# Bootstrap the juju environment
110
7
juju bootstrap --debug
111
8
112
9
# Deploy the juju-gui to the bootstrap node
113
10
juju deploy --to=0 juju-gui
114
11
juju expose juju-gui
115
12
116
13
ADMIN_SECRET=`cat ~/.juju/environments/maas.jenv | grep admin-secret | awk '{ print $2 }'`
117
14
JUJU_GUI=`juju status juju-gui | grep public-address | awk '{ print $2 }' | xargs host | grep address | awk '{ print $4 }'`
118
15
echo "Admin Secret: $ADMIN_SECRET"
119
16
echo "juju-gui: http://$JUJU_GUI"
120
17
0
121
=== added file 'usr/lib/orange-box/examples/hadoop/01-deploy.sh'
122
--- usr/lib/orange-box/examples/hadoop/01-deploy.sh	1970-01-01 00:00:00 +0000
123
+++ usr/lib/orange-box/examples/hadoop/01-deploy.sh	2014-07-24 01:23:40 +0000
124
@@ -0,0 +1,10 @@
125
1
#!/bin/bash
126
2
127
3
128
4
set -e
129
5
130
6
juju set-constraints tags=
131
7
juju-deployer -c hadoop.yaml
132
8
133
9
134
10
echo "Deployment finished"
135
0
11
136
=== removed file 'usr/lib/orange-box/examples/hadoop/01-get-juju-gui-info.sh'
137
--- usr/lib/orange-box/examples/hadoop/01-get-juju-gui-info.sh	2014-06-10 23:44:37 +0000
138
+++ usr/lib/orange-box/examples/hadoop/01-get-juju-gui-info.sh	1970-01-01 00:00:00 +0000
139
@@ -1,6 +0,0 @@
140
1
#!/bin/bash
141
2
ADMIN_SECRET=`cat ~/.juju/environments/maas.jenv | grep admin-secret | awk '{ print $2 }'`
142
3
JUJU_GUI=`juju status juju-gui | grep public-address | awk '{ print $2 }' | xargs host | grep address | awk '{ print $4 }'`
143
4
echo "Admin Secret: $ADMIN_SECRET"
144
5
echo "juju-gui: http://$JUJU_GUI"
145
6
146
7
0
147
=== removed file 'usr/lib/orange-box/examples/hadoop/02-hadoop.yaml'
148
--- usr/lib/orange-box/examples/hadoop/02-hadoop.yaml	2014-07-16 07:31:25 +0000
149
+++ usr/lib/orange-box/examples/hadoop/02-hadoop.yaml	1970-01-01 00:00:00 +0000
150
@@ -1,44 +0,0 @@
151
1
envExport:
152
2
  services:
153
3
    "hadoop-master":
154
4
      charm: "cs:trusty/hadoop-13"
155
5
      num_units: 1
156
6
      expose: true
157
7
      constraints: tags=physical
158
8
      annotations:
159
9
        "gui-x": "914.9191466830049"
160
10
        "gui-y": "112.84003435856067"
161
11
    hive-metadata:
162
12
      charm: "cs:precise/mysql-46"
163
13
      num_units: 1
164
14
      options:
165
15
        "binlog-format": ROW
166
16
      annotations:
167
17
        "gui-x": "1424.919207718161"
168
18
        "gui-y": "343.5067213702795"
169
19
    hive:
170
20
      charm: "cs:precise/hive-5"
171
21
      num_units: 1
172
22
      to: "hive-metadata"
173
23
      annotations:
174
24
        "gui-x": "1146.5858336947235"
175
25
        "gui-y": "340.3796452663048"
176
26
    "hadoop-slavecluster":
177
27
      charm: "cs:trusty/hadoop-13"
178
28
      num_units: 2
179
29
      constraints: tags=physical
180
30
      annotations:
181
31
        "gui-x": "648.3332046960281"
182
32
        "gui-y": "340.61878278661516"
183
33
  relations:
184
34
    - - "hive:jobtracker"
185
35
      - "hadoop-master:resourcemanager"
186
36
    - - "hive:namenode"
187
37
      - "hadoop-master:namenode"
188
38
    - - "hive:db"
189
39
      - "hive-metadata:db"
190
40
    - - "hadoop-master:resourcemanager"
191
41
      - "hadoop-slavecluster:nodemanager"
192
42
    - - "hadoop-master:namenode"
193
43
      - "hadoop-slavecluster:datanode"
194
44
  series: precise
195
45
0
196
=== added file 'usr/lib/orange-box/examples/hadoop/02-run-terasort.sh'
197
--- usr/lib/orange-box/examples/hadoop/02-run-terasort.sh	1970-01-01 00:00:00 +0000
198
+++ usr/lib/orange-box/examples/hadoop/02-run-terasort.sh	2014-07-24 01:23:40 +0000
199
@@ -0,0 +1,2 @@
200
1
#!/bin/bash
201
2
juju ssh hadoop-master/0 "sudo su -l ubuntu -c /home/ubuntu/hadoop/terasort.sh"
202
0
3
203
=== added file 'usr/lib/orange-box/examples/hadoop/03-hive-demo.txt'
204
--- usr/lib/orange-box/examples/hadoop/03-hive-demo.txt	1970-01-01 00:00:00 +0000
205
+++ usr/lib/orange-box/examples/hadoop/03-hive-demo.txt	2014-07-24 01:23:40 +0000
206
@@ -0,0 +1,9 @@
207
1
create database demo;
208
2
juju ssh hive/0
209
3
sudo su
210
4
su - hdfs
211
5
hive
212
6
use demo;
213
7
create external table demo (field1 STRING, field2 STRING) location '/user/hdfs/demo';
214
8
load data inpath '/user/hdfs/out_dir/part-00001' into table demo;
215
9
select count(field1) from demo;
216
0
10
217
=== removed file 'usr/lib/orange-box/examples/hadoop/03-run-terasort.sh'
218
--- usr/lib/orange-box/examples/hadoop/03-run-terasort.sh	2014-07-16 07:31:25 +0000
219
+++ usr/lib/orange-box/examples/hadoop/03-run-terasort.sh	1970-01-01 00:00:00 +0000
220
@@ -1,2 +0,0 @@
221
1
#!/bin/bash
222
2
juju ssh hadoop-master/0 "sudo su -l ubuntu -c /home/ubuntu/hadoop/terasort.sh"
223
3
0
224
=== removed file 'usr/lib/orange-box/examples/hadoop/04-hive-demo.txt'
225
--- usr/lib/orange-box/examples/hadoop/04-hive-demo.txt	2014-06-10 23:44:37 +0000
226
+++ usr/lib/orange-box/examples/hadoop/04-hive-demo.txt	1970-01-01 00:00:00 +0000
227
@@ -1,9 +0,0 @@
228
1
create database demo;
229
2
juju ssh hive/0
230
3
sudo su
231
4
su - hdfs
232
5
hive
233
6
use demo;
234
7
create external table demo (field1 STRING, field2 STRING) location '/user/hdfs/demo';
235
8
load data inpath '/user/hdfs/out_dir/part-00001' into table demo;
236
9
select count(field1) from demo;
237
10
0
238
=== added file 'usr/lib/orange-box/examples/hadoop/README'
239
--- usr/lib/orange-box/examples/hadoop/README	1970-01-01 00:00:00 +0000
240
+++ usr/lib/orange-box/examples/hadoop/README	2014-07-24 01:23:40 +0000
241
@@ -0,0 +1,11 @@
242
1
Run the command:
243
2
./01-deploy.sh to deploy hadoop.
244
3
./02-run-terasort.sh to run an example terasort and watch it from the hadoop web UI.
245
4
246
5
To find out the Hadoop Web UI address run:
247
6
./get-hadoop-info.sh
248
7
249
8
There are demo commands for hive in:
250
9
03-hive-demo.txt
251
10
But you must run these manually, so cat the file and then run the commands at your terminal one at a time.
252
11
253
0
12
254
=== removed file 'usr/lib/orange-box/examples/hadoop/demo.sh'
255
--- usr/lib/orange-box/examples/hadoop/demo.sh	2014-06-10 23:44:37 +0000
256
+++ usr/lib/orange-box/examples/hadoop/demo.sh	1970-01-01 00:00:00 +0000
257
@@ -1,33 +0,0 @@
258
1
#!/bin/bash
259
2
260
3
# Remove any stale ssh known hosts
261
4
rm -f ~/.ssh/known_hosts
262
5
263
6
# Bootstrap the juju environment
264
7
juju bootstrap --debug
265
8
266
9
# Deploy the juju-gui to the bootstrap node
267
10
juju deploy --to=0 juju-gui
268
11
juju expose juju-gui
269
12
270
13
# Deploy hadoop ( with HBase enabled )
271
14
juju deploy hadoop hadoop-master
272
15
juju set hadoop-master hbase=True
273
16
juju deploy hadoop hadoop-slavecluster -n 3
274
17
juju set hadoop-slavecluster hbase=True
275
18
juju add-relation hadoop-master:namenode hadoop-slavecluster:datanode
276
19
juju add-relation hadoop-master:jobtracker hadoop-slavecluster:tasktracker
277
20
juju expose hadoop-master
278
21
279
22
# Deploy hive ( with MySQL )
280
23
juju deploy hive -n 3
281
24
juju deploy mysql
282
25
juju set mysql binlog-format=ROW
283
26
juju add-relation hive:db mysql:db
284
27
juju add-relation hive:namenode hadoop-master:namenode
285
28
juju add-relation hive:jobtracker hadoop-master:jobtracker
286
29
287
30
ADMIN_SECRET=`cat ~/.juju/environments/maas.jenv | grep admin-secret | awk '{ print $2 }'`
288
31
JUJU_GUI=`juju status juju-gui | grep public-address | awk '{ print $2 }' | xargs host | grep address | awk '{ print $4 }'`
289
32
echo "Admin Secret: $ADMIN_SECRET"
290
33
echo "juju-gui: http://$JUJU_GUI"
291
34
0
292
=== added file 'usr/lib/orange-box/examples/hadoop/hadoop.yaml'
293
--- usr/lib/orange-box/examples/hadoop/hadoop.yaml	1970-01-01 00:00:00 +0000
294
+++ usr/lib/orange-box/examples/hadoop/hadoop.yaml	2014-07-24 01:23:40 +0000
295
@@ -0,0 +1,44 @@
296
1
envExport:
297
2
  services:
298
3
    "hadoop-master":
299
4
      charm: "cs:trusty/hadoop-13"
300
5
      num_units: 1
301
6
      expose: true
302
7
      constraints: tags=physical
303
8
      annotations:
304
9
        "gui-x": "914.9191466830049"
305
10
        "gui-y": "112.84003435856067"
306
11
    hive-metadata:
307
12
      charm: "cs:precise/mysql-46"
308
13
      num_units: 1
309
14
      options:
310
15
        "binlog-format": ROW
311
16
      annotations:
312
17
        "gui-x": "1424.919207718161"
313
18
        "gui-y": "343.5067213702795"
314
19
    hive:
315
20
      charm: "cs:precise/hive-5"
316
21
      num_units: 1
317
22
      to: "hive-metadata"
318
23
      annotations:
319
24
        "gui-x": "1146.5858336947235"
320
25
        "gui-y": "340.3796452663048"
321
26
    "hadoop-slavecluster":
322
27
      charm: "cs:trusty/hadoop-13"
323
28
      num_units: 2
324
29
      constraints: tags=physical
325
30
      annotations:
326
31
        "gui-x": "648.3332046960281"
327
32
        "gui-y": "340.61878278661516"
328
33
  relations:
329
34
    - - "hive:jobtracker"
330
35
      - "hadoop-master:resourcemanager"
331
36
    - - "hive:namenode"
332
37
      - "hadoop-master:namenode"
333
38
    - - "hive:db"
334
39
      - "hive-metadata:db"
335
40
    - - "hadoop-master:resourcemanager"
336
41
      - "hadoop-slavecluster:nodemanager"
337
42
    - - "hadoop-master:namenode"
338
43
      - "hadoop-slavecluster:datanode"
339
44
  series: precise
340
0
45
341
=== added directory 'usr/lib/orange-box/examples/infrastructure'
342
=== added directory 'usr/lib/orange-box/examples/infrastructure/precise'
343
=== added file 'usr/lib/orange-box/examples/infrastructure/precise/01-deploy.sh'
344
--- usr/lib/orange-box/examples/infrastructure/precise/01-deploy.sh	1970-01-01 00:00:00 +0000
345
+++ usr/lib/orange-box/examples/infrastructure/precise/01-deploy.sh	2014-07-24 01:23:40 +0000
346
@@ -0,0 +1,13 @@
347
1
#!/bin/bash
348
2
349
3
set -e
350
4
351
5
sudo rm -f /srv/charmstore/precise/rsyslog-primary;sudo ln -s /srv/charmstore/precise/rsyslog /srv/charmstore/precise/rsyslog-primary
352
6
sudo rm -f /srv/charmstore/precise/rsyslog-secondary;sudo ln -s /srv/charmstore/precise/rsyslog /srv/charmstore/precise/rsyslog-secondary
353
7
sudo rm -f /srv/charmstore/precise/logstash-elasticsearch;sudo ln -s /srv/charmstore/precise/elasticsearch /srv/charmstore/precise/logstash-elasticsearch
354
8
355
9
juju set-constraints tags=
356
10
juju-deployer -c infrastructure-bundle.yaml 
357
11
358
12
359
13
echo "Deployment finished"
360
0
14
361
=== added file 'usr/lib/orange-box/examples/infrastructure/precise/infrastructure-bundle.yaml'
362
--- usr/lib/orange-box/examples/infrastructure/precise/infrastructure-bundle.yaml	1970-01-01 00:00:00 +0000
363
+++ usr/lib/orange-box/examples/infrastructure/precise/infrastructure-bundle.yaml	2014-07-24 01:23:40 +0000
364
@@ -0,0 +1,42 @@
365
1
envExport: 
366
2
  services: 
367
3
    "landscape-client": 
368
4
      branch: "lp:charms/landscape-client"
369
5
      num_units: 0
370
6
      annotations: 
371
7
        "gui-x": "-420"
372
8
        "gui-y": "545"
373
9
    nagios: 
374
10
      branch: "lp:charms/nagios"
375
11
      num_units: 1
376
12
      constraints: tags=nagios
377
13
      expose: true
378
14
      annotations: 
379
15
        "gui-x": "-680"
380
16
        "gui-y": "785"
381
17
    nrpe: 
382
18
      branch: "lp:charms/nrpe"
383
19
      num_units: 0
384
20
      annotations: 
385
21
        "gui-x": "-420"
386
22
        "gui-y": "785"
387
23
    ganglia: 
388
24
      branch: "lp:charms/ganglia"
389
25
      num_units: 1
390
26
      to: lxc:nagios=0
391
27
      expose: true
392
28
      annotations: 
393
29
        "gui-x": "-680"
394
30
        "gui-y": "1020"
395
31
    "ganglia-node": 
396
32
      branch: "lp:charms/ganglia-node"
397
33
      num_units: 0
398
34
      annotations: 
399
35
        "gui-x": "-420"
400
36
        "gui-y": "1020"
401
37
  relations: 
402
38
    - - "ganglia:node"
403
39
      - "ganglia-node:node"
404
40
    - - "nagios:monitors"
405
41
      - "nrpe:monitors"
406
42
  series: precise
407
0
43
408
=== added directory 'usr/lib/orange-box/examples/infrastructure/trusty'
409
=== added file 'usr/lib/orange-box/examples/infrastructure/trusty/01-deploy.sh'
410
--- usr/lib/orange-box/examples/infrastructure/trusty/01-deploy.sh	1970-01-01 00:00:00 +0000
411
+++ usr/lib/orange-box/examples/infrastructure/trusty/01-deploy.sh	2014-07-24 01:23:40 +0000
412
@@ -0,0 +1,13 @@
413
1
#!/bin/bash
414
2
415
3
set -e
416
4
417
5
sudo rm -f /srv/charmstore/trusty/rsyslog-primary;sudo ln -s /srv/charmstore/trusty/rsyslog /srv/charmstore/trusty/rsyslog-primary
418
6
sudo rm -f /srv/charmstore/trusty/rsyslog-secondary;sudo ln -s /srv/charmstore/trusty/rsyslog /srv/charmstore/trusty/rsyslog-secondary
419
7
sudo rm -f /srv/charmstore/trusty/logstash-elasticsearch;sudo ln -s /srv/charmstore/trusty/elasticsearch /srv/charmstore/trusty/logstash-elasticsearch
420
8
421
9
juju set-constraints tags=
422
10
juju-deployer -c infrastructure-bundle.yaml 
423
11
424
12
425
13
echo "Deployment finished"
426
0
14
427
=== added file 'usr/lib/orange-box/examples/infrastructure/trusty/infrastructure-bundle.yaml'
428
--- usr/lib/orange-box/examples/infrastructure/trusty/infrastructure-bundle.yaml	1970-01-01 00:00:00 +0000
429
+++ usr/lib/orange-box/examples/infrastructure/trusty/infrastructure-bundle.yaml	2014-07-24 01:23:40 +0000
430
@@ -0,0 +1,42 @@
431
1
envExport: 
432
2
  services: 
433
3
    "landscape-client": 
434
4
      branch: "lp:charms/landscape-client"
435
5
      num_units: 0
436
6
      annotations: 
437
7
        "gui-x": "-420"
438
8
        "gui-y": "545"
439
9
    nagios: 
440
10
      branch: "lp:charms/nagios"
441
11
      num_units: 1
442
12
      constraints: tags=nagios
443
13
      expose: true
444
14
      annotations: 
445
15
        "gui-x": "-680"
446
16
        "gui-y": "785"
447
17
    nrpe: 
448
18
      branch: "lp:charms/nrpe"
449
19
      num_units: 0
450
20
      annotations: 
451
21
        "gui-x": "-420"
452
22
        "gui-y": "785"
453
23
    ganglia: 
454
24
      branch: "lp:charms/ganglia"
455
25
      num_units: 1
456
26
      to: lxc:nagios=0
457
27
      expose: true
458
28
      annotations: 
459
29
        "gui-x": "-680"
460
30
        "gui-y": "1020"
461
31
    "ganglia-node": 
462
32
      branch: "lp:charms/ganglia-node"
463
33
      num_units: 0
464
34
      annotations: 
465
35
        "gui-x": "-420"
466
36
        "gui-y": "1020"
467
37
  relations: 
468
38
    - - "ganglia:node"
469
39
      - "ganglia-node:node"
470
40
    - - "nagios:monitors"
471
41
      - "nrpe:monitors"
472
42
  series: trusty
473
0
43
474
=== added directory 'usr/lib/orange-box/examples/landscape'
475
=== added file 'usr/lib/orange-box/examples/landscape/01-deploy.sh'
476
--- usr/lib/orange-box/examples/landscape/01-deploy.sh	1970-01-01 00:00:00 +0000
477
+++ usr/lib/orange-box/examples/landscape/01-deploy.sh	2014-07-24 01:23:40 +0000
478
@@ -0,0 +1,20 @@
479
1
#!/bin/bash
480
2
481
3
482
4
set -e
483
5
484
6
if [ ! -f repo-file ]; then
485
7
    echo "repo-file not found! exiting"
486
8
    exit
487
9
fi
488
10
if [ ! -f license-file ]; then
489
11
    echo "license-file not found! exiting"
490
12
    exit
491
13
fi
492
14
493
15
494
16
juju set-constraints tags=
495
17
juju-deployer -c landscape-deployments-ob.yaml landscape-ob
496
18
497
19
498
20
echo "Deployment finished"
499
0
21
500
=== added file 'usr/lib/orange-box/examples/landscape/README'
501
--- usr/lib/orange-box/examples/landscape/README	1970-01-01 00:00:00 +0000
502
+++ usr/lib/orange-box/examples/landscape/README	2014-07-24 01:23:40 +0000
503
@@ -0,0 +1,56 @@
504
1
Landscape Installer Demo
505
2
506
3
Prerequisites: 
507
4
508
5
At least 5 physical nodes with a second disk.
509
6
 You will therefore need extra USB flash drives (pref 64GB) on nodes without a second disk already (nodes 1-4).
510
7
511
8
At least 1 node with 2 NICs, all management services will be installed here, including Neutron and Juju bootstrap.
512
9
 This should be on node0vm1.maas.
513
10
 This virtual machine must have at least 20GB of space available.
514
11
515
12
At least 1 MAAS node with the MAAS tag "landscape", this should be node1.maas.
516
13
517
14
You will need to create a file: "repo-file" in this directory with the URL of the Landscape repository.
518
15
519
16
You will need to create a file: "license-file" in this directory with a valid license or trial license to use Landscape.
520
17
521
18
Overview:
522
19
523
20
First an initial Juju environment will be used to deploy Landscape itself onto the OB.
524
21
Once Landscape is installed, register the MAAS into Landscape.
525
22
Then use the Openstack Installer Page to install the rest of the cloud onto a new Juju environment managed by Landscape.
526
23
Once installed, find the details to connect to the Openstack Dashboard from Landscape.
527
24
Log in and start using the cloud.
528
25
529
26
Method:
530
27
531
28
1) Bootstrap the first Juju environment on node0vm0.maas and install Juju-gui.
532
29
2) Deploy Landscape on node1.maas.
533
30
3) Connect to Landscape Web UI and create initial admin user.
534
31
4) Register the MAAS server into Landscape.
535
32
5) Use the Landscape Cloud Installer to deploy a new Juju environment with Openstack.
536
33
6) When completed, get the login credentials from Landscape.
537
34
7) Log into the Openstack Dashboard to deploy instances.
538
35
539
36
Commands:
540
37
541
38
Use the normal bootstrap in ~/Examples/00-bootstrap.sh - bootstraps Juju and installs the GUI.
542
39
cd ~/Examples/landscape
543
40
./01-deploy.sh - Deploys the Landscape Bundle
544
41
More demo actions here, such as deploying a cloud.
545
42
Then destroying the cloud.
546
43
./99-cleanup.sh - Destroys the Landscape Juju environment.
547
44
548
45
Troubleshooting:
549
46
550
47
To troubleshoot the Landscape Juju environment
551
48
1) Connect to the landscape instance
552
49
 juju ssh landscape/0
553
50
2) sudo to the Landscape user, setting JUJU_HOME
554
51
 sudo -u landscape JUJU_HOME=/var/lib/landscape/juju-homes/XXX/ bash 
555
52
Where XXX is the Juju environment number (find it from the Juju tab in Landscape UI)
556
53
3) Use juju commands as normal
557
54
 juju stat
558
55
 juju debug-log
559
56
560
0
57
561
=== added file 'usr/lib/orange-box/examples/landscape/landscape-deployments-ob.yaml'
562
--- usr/lib/orange-box/examples/landscape/landscape-deployments-ob.yaml	1970-01-01 00:00:00 +0000
563
+++ usr/lib/orange-box/examples/landscape/landscape-deployments-ob.yaml	2014-07-24 01:23:40 +0000
564
@@ -0,0 +1,91 @@
565
1
_common:
566
2
    services:
567
3
        rabbitmq-server:
568
4
            charm: cs:precise/rabbitmq-server-28
569
5
        postgresql:
570
6
            charm: cs:precise/postgresql-73
571
7
            constraints: mem=2048
572
8
            options:
573
9
                extra-packages: python-apt postgresql-contrib postgresql-.*-debversion
574
10
                max_connections: 500
575
11
        haproxy:
576
12
            charm: cs:precise/haproxy-31
577
13
            options:
578
14
                enable_monitoring: True
579
15
                monitoring_allowed_cidr: "0.0.0.0/0"
580
16
                monitoring_password: "haproxy"
581
17
                default_timeouts: "queue 60000, connect 5000, client 120000, server 120000"
582
18
                # Don't deploy default haproxy service on port 80
583
19
                services: ""
584
20
        apache2:
585
21
            charm: cs:precise/apache2-24
586
22
            expose: True
587
23
            options:
588
24
                enable_modules: proxy proxy_http proxy_balancer rewrite expires headers ssl
589
25
                ssl_cert: SELFSIGNED
590
26
                ssl_certlocation: apache2.cert
591
27
                ssl_keylocation: apache2.key
592
28
593
29
landscape:
594
30
    inherits: _common
595
31
    series: precise
596
32
    services:
597
33
        landscape:
598
34
            branch: lp:~landscape/landscape-charm/stable
599
35
            constraints: mem=2048
600
36
            options:
601
37
                service-count: "2"
602
38
                landscape-password: "look-a-different-password"
603
39
                services: static appserver pingserver combo-loader async-frontend apiserver package-upload jobhandler package-search cron juju-sync
604
40
                repository: include-file://repo-file
605
41
                license-file: include-file://license-file
606
42
        landscape-msg:
607
43
            branch: lp:~landscape/landscape-charm/stable
608
44
            charm: landscape
609
45
            constraints: mem=2048
610
46
            options:
611
47
                landscape-password: "look-a-different-password"
612
48
                services: msgserver
613
49
                repository: include-file://repo-file
614
50
                license-file: include-file://license-file
615
51
    relations:
616
52
        - [landscape, rabbitmq-server]
617
53
        - [landscape, haproxy]
618
54
        - ["landscape:vhost-config", "apache2:vhost-config"]
619
55
        - ["landscape:db-admin", "postgresql:db-admin"]
620
56
        - ["haproxy:website", "apache2:reverseproxy"]
621
57
        - [landscape-msg, rabbitmq-server]
622
58
        - [landscape-msg, haproxy]
623
59
        - ["landscape-msg:db-admin", "postgresql:db-admin"]
624
60
625
61
landscape-dense-maas:
626
62
    inherits: landscape
627
63
    services:
628
64
        landscape:
629
65
            to: lxc:0
630
66
        landscape-msg:
631
67
            to: lxc:0
632
68
        postgresql:
633
69
            to: lxc:0
634
70
        rabbitmq-server:
635
71
            to: lxc:0
636
72
        apache2:
637
73
            to: lxc:0
638
74
        haproxy:
639
75
            to: lxc:0
640
76
641
77
landscape-ob:
642
78
    inherits: landscape
643
79
    services:
644
80
        landscape:
645
81
            constraints: tags=landscape
646
82
        landscape-msg:
647
83
            to: lxc:landscape=0
648
84
        postgresql:
649
85
            to: lxc:landscape=0
650
86
        rabbitmq-server:
651
87
            to: lxc:landscape=0
652
88
        apache2:
653
89
            to: lxc:landscape=0
654
90
        haproxy:
655
91
            to: lxc:landscape=0
656
0
92
657
=== removed directory 'usr/lib/orange-box/examples/openstack/complex'
658
=== removed file 'usr/lib/orange-box/examples/openstack/complex/README'
659
--- usr/lib/orange-box/examples/openstack/complex/README	2014-06-10 23:44:37 +0000
660
+++ usr/lib/orange-box/examples/openstack/complex/README	1970-01-01 00:00:00 +0000
661
@@ -1,26 +0,0 @@
662
1
*** CURRENTLY BROKEN ***
663
2
664
3
This is the Openstack deployment demo folder.
665
4
666
5
Step 1: Run the script:
667
6
./openstack-prereqs-install.sh
668
7
669
8
Step 2: Change into a subdirectory of the deployment you want to use, use havana as default.
670
9
cd havana
671
10
672
11
Step 3: Run the pre-deployment to set up Juju and the GUI
673
12
./01demo-prep.sh
674
13
675
14
Step 4: Ready to run the demo!
676
15
./02deploy.sh
677
16
678
17
Step 5: Configure Openstack and Juju to Use Openstack
679
18
./03configure-cloud.sh
680
19
681
20
Step 6: Deploy other workloads ontop of Openstack.
682
21
See other demo workload folders
683
22
684
23
Step 7: Cleanup after a demo:
685
24
./04cleanup.sh
686
25
687
26
Ready to run the demo again.
688
27
0
689
=== removed file 'usr/lib/orange-box/examples/openstack/complex/bridge2.xml'
690
--- usr/lib/orange-box/examples/openstack/complex/bridge2.xml	2014-06-10 23:44:37 +0000
691
+++ usr/lib/orange-box/examples/openstack/complex/bridge2.xml	1970-01-01 00:00:00 +0000
692
@@ -1,11 +0,0 @@
693
1
<network>
694
2
  <name>bridge2</name>
695
3
  <uuid>406212bb-45f7-4af7-91b6-0edfb6e5908c</uuid>
696
4
  <forward dev='eth0' mode='nat'>
697
5
    <interface dev='eth0'/>
698
6
  </forward>
699
7
  <bridge name='virbr1' stp='on' delay='0'/>
700
8
  <mac address='52:54:00:e7:ee:1e'/>
701
9
  <ip address='172.16.1.1' netmask='255.255.255.0'>
702
10
  </ip>
703
11
</network>
704
12
0
705
=== removed directory 'usr/lib/orange-box/examples/openstack/complex/havana'
706
=== removed directory 'usr/lib/orange-box/examples/openstack/complex/havana-colo'
707
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-colo/01demo-prep.sh'
708
=== target was u'../havana/01demo-prep.sh'
709
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-colo/02deploy.sh'
710
=== target was u'../havana/02deploy.sh'
711
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-colo/03configure-cloud.sh'
712
=== target was u'../havana/03configure-cloud.sh'
713
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-colo/04cleanup.sh'
714
=== target was u'../havana/04cleanup.sh'
715
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-colo/README'
716
=== target was u'../havana/README'
717
=== removed file 'usr/lib/orange-box/examples/openstack/complex/havana-colo/bundle.yaml'
718
--- usr/lib/orange-box/examples/openstack/complex/havana-colo/bundle.yaml	2014-06-10 23:44:37 +0000
719
+++ usr/lib/orange-box/examples/openstack/complex/havana-colo/bundle.yaml	1970-01-01 00:00:00 +0000
720
@@ -1,214 +0,0 @@
721
1
# vim :set ts=2 et:
722
2
openstack:
723
3
  series: precise
724
4
  overrides:
725
5
    openstack-origin: cloud:precise-havana
726
6
    source: cloud:precise-updates/havana
727
7
  services:
728
8
    ubuntu: 
729
9
      charm: cs:precise/ubuntu
730
10
      constraints: tags=nuc
731
11
    landscape-client:
732
12
      charm: cs:precise/landscape-client
733
13
      options:
734
14
        origin: ppa:landscape/trunk
735
15
        exchange-interval: 60
736
16
        urgent-exchange-interval: 30
737
17
        ping-interval: 10
738
18
        script-users: ALL
739
19
        include-manager-plugins: ScriptExecution
740
20
    lds:
741
21
      branch: lp:charms/lds-quickstart
742
22
      options:
743
23
        server_fqdn: lds.master
744
24
        admin_email: admin@lds.master
745
25
        admin_name: admin
746
26
        admin_password: Password1+
747
27
        license: include-file://license.txt
748
28
        sample_data: False
749
29
      constraints: tags=lds
750
30
    mysql:
751
31
      charm: cs:precise/mysql-29
752
32
      options:
753
33
        dataset-size: 50%
754
34
      to: lxc:ubuntu=0
755
35
    rabbitmq-server:
756
36
      charm: cs:precise/rabbitmq-server-16
757
37
      constraints: mem=1G
758
38
      to: lxc:ubuntu=0
759
39
    ceph:
760
40
      charm: cs:precise/ceph
761
41
      num_units: 6
762
42
      options:
763
43
        monitor-count: 3
764
44
        fsid: 9e7aac42-4bf4-11e3-b4b7-5254006a039c
765
45
        monitor-secret: AQAAvoJSOAv/NRAAgvXP8d7iXN7lWYbvDZzm2Q==
766
46
        osd-devices: /srv
767
47
        osd-reformat: "yes"
768
48
      to: [nova-compute=0, nova-compute=1, nova-compute=2, nova-compute=3, nova-compute=4, nova-compute=5]
769
49
    keystone:
770
50
      charm: cs:precise/keystone-23
771
51
      options:
772
52
        admin-password: Password1+
773
53
        admin-token: ubuntutesting
774
54
      to: lxc:ubuntu=0
775
55
    openstack-dashboard:
776
56
      charm: cs:precise/openstack-dashboard-11
777
57
      options:
778
58
        offline-compression: "no"
779
59
        webroot: "/"
780
60
      to: lxc:ubuntu=0
781
61
    nova-compute:
782
62
      charm: cs:precise/nova-compute
783
63
      num_units: 8
784
64
      options:
785
65
        config-flags: "auto_assign_floating_ip=False"
786
66
        enable-live-migration: False
787
67
        virt-type: kvm
788
68
      constraints: tags=nuc
789
69
    nova-cloud-controller:
790
70
      charm: cs:precise/nova-cloud-controller-19
791
71
      options:
792
72
        network-manager: Neutron
793
73
        quantum-security-groups: "yes"
794
74
      to: lxc:ubuntu=0
795
75
    neutron-gateway:
796
76
      charm: cs:precise/quantum-gateway-12
797
77
      options:
798
78
        ext-port: eth0
799
79
      constraints: tags=neutron
800
80
    cinder:
801
81
      charm: cs:precise/cinder-14
802
82
      options:
803
83
        block-device: "None"
804
84
      to: lxc:ubuntu=0
805
85
    glance:
806
86
      charm: cs:precise/glance-26
807
87
      to: lxc:ubuntu=0
808
88
    swift-proxy:
809
89
      charm: cs:precise/swift-proxy
810
90
      options:
811
91
        zone-assignment: manual
812
92
        replicas: 2
813
93
        use-https: 'no'
814
94
        swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
815
95
      to: lxc:ubuntu=0
816
96
    swift-storage-z1:
817
97
      charm: cs:precise/swift-storage
818
98
      options:
819
99
        zone: 1
820
100
        block-device: "/srv/swift.img|30G"
821
101
      to: nova-compute=6
822
102
    swift-storage-z2:
823
103
      charm: cs:precise/swift-storage
824
104
      options:
825
105
        zone: 2
826
106
        block-device: "/srv/swift.img|30G"
827
107
      to: nova-compute=7
828
108
    ceilometer:
829
109
      charm: cs:precise/ceilometer
830
110
      to: lxc:ubuntu=0
831
111
    ceilometer-agent:
832
112
      charm: cs:precise/ceilometer-agent
833
113
    mongodb:
834
114
      charm: cs:precise/mongodb
835
115
      to: lxc:ubuntu=0
836
116
    ntp:
837
117
      charm: cs:precise/ntp
838
118
  relations:
839
119
    - - keystone
840
120
      - mysql
841
121
    - - nova-cloud-controller
842
122
      - mysql
843
123
    - - nova-cloud-controller
844
124
      - rabbitmq-server
845
125
    - - nova-cloud-controller
846
126
      - glance
847
127
    - - nova-cloud-controller
848
128
      - keystone
849
129
    - - nova-compute
850
130
      - nova-cloud-controller
851
131
    - - nova-compute
852
132
      - mysql
853
133
    - - nova-compute
854
134
      - rabbitmq-server:amqp
855
135
    - - nova-compute
856
136
      - glance
857
137
    - - nova-compute
858
138
      - ceph
859
139
    - - glance
860
140
      - mysql
861
141
    - - glance
862
142
      - keystone
863
143
    - - glance
864
144
      - ceph
865
145
    - - glance
866
146
      - cinder
867
147
    - - cinder
868
148
      - mysql
869
149
    - - cinder
870
150
      - rabbitmq-server
871
151
    - - cinder
872
152
      - nova-cloud-controller
873
153
    - - cinder
874
154
      - keystone
875
155
    - - cinder
876
156
      - ceph
877
157
    - - neutron-gateway
878
158
      - mysql
879
159
    - - neutron-gateway
880
160
      - rabbitmq-server
881
161
    - - neutron-gateway
882
162
      - nova-cloud-controller
883
163
    - - openstack-dashboard
884
164
      - keystone
885
165
    - - swift-proxy
886
166
      - keystone
887
167
    - - swift-proxy
888
168
      - swift-storage-z1
889
169
    - - swift-proxy
890
170
      - swift-storage-z2
891
171
    - - ceilometer
892
172
      - keystone
893
173
    - - ceilometer
894
174
      - rabbitmq-server
895
175
    - - ceilometer
896
176
      - mongodb
897
177
    - - ceilometer-agent:nova-ceilometer
898
178
      - nova-compute:nova-ceilometer
899
179
    - - ceilometer-agent:ceilometer-service
900
180
      - ceilometer:ceilometer-service
901
181
    - - ntp:juju-info
902
182
      - nova-compute:juju-info
903
183
    - - ntp:juju-info
904
184
      - nova-cloud-controller:juju-info
905
185
    - - ntp:juju-info
906
186
      - neutron-gateway:juju-info
907
187
    - - ntp:juju-info
908
188
      - ceph:juju-info
909
189
    - - ntp:juju-info
910
190
      - cinder:juju-info
911
191
    - - ntp:juju-info
912
192
      - keystone:juju-info
913
193
    - - ntp:juju-info
914
194
      - glance:juju-info
915
195
    - - ntp:juju-info
916
196
      - swift-proxy:juju-info
917
197
    - - ntp:juju-info
918
198
      - swift-storage-z1:juju-info
919
199
    - - ntp:juju-info
920
200
      - swift-storage-z2:juju-info
921
201
    - - ntp:juju-info
922
202
      - ceilometer:juju-info
923
203
    - - ntp:juju-info
924
204
      - mongodb:juju-info
925
205
    - - ntp:juju-info
926
206
      - rabbitmq-server:juju-info
927
207
    - - ntp:juju-info
928
208
      - mysql:juju-info
929
209
    - - ntp:juju-info
930
210
      - openstack-dashboard:juju-info
931
211
    - - landscape-client:container
932
212
      - [ lds, neutron-gateway, ubuntu, mysql, cinder, keystone, rabbitmq-server, glance, openstack-dashboard, nova-cloud-controller, ceilometer, mongodb, nova-compute, swift-proxy ]
933
213
    - - landscape-client:registration
934
214
      - lds
935
215
0
936
=== removed directory 'usr/lib/orange-box/examples/openstack/complex/havana-compute'
937
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-compute/01demo-prep.sh'
938
=== target was u'../havana/01demo-prep.sh'
939
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-compute/02deploy.sh'
940
=== target was u'../havana/02deploy.sh'
941
=== removed file 'usr/lib/orange-box/examples/openstack/complex/havana-compute/03configure-cloud.sh'
942
--- usr/lib/orange-box/examples/openstack/complex/havana-compute/03configure-cloud.sh	2014-06-10 23:44:37 +0000
943
+++ usr/lib/orange-box/examples/openstack/complex/havana-compute/03configure-cloud.sh	1970-01-01 00:00:00 +0000
944
@@ -1,14 +0,0 @@
945
1
#!/bin/bash
946
2
947
3
echo "Configuring Openstack environment"
948
4
cd ../openstack-configuration/
949
5
950
6
[ -f ~/images/precise-server-cloudimg-amd64-disk1.img ] || ./get-cloud-images
951
7
952
8
./inspect-environment
953
9
source envrc
954
10
955
11
./prepare-cloud havana
956
12
957
13
echo "Skipping Juju config as no Object Storage available for Juju"
958
14
959
15
0
960
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-compute/04cleanup.sh'
961
=== target was u'../havana/04cleanup.sh'
962
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-compute/README'
963
=== target was u'../havana/README'
964
=== removed file 'usr/lib/orange-box/examples/openstack/complex/havana-compute/bundle.yaml'
965
--- usr/lib/orange-box/examples/openstack/complex/havana-compute/bundle.yaml	2014-06-10 23:44:37 +0000
966
+++ usr/lib/orange-box/examples/openstack/complex/havana-compute/bundle.yaml	1970-01-01 00:00:00 +0000
967
@@ -1,164 +0,0 @@
968
1
# vim :set ts=2 et:
969
2
openstack:
970
3
  series: precise
971
4
  overrides:
972
5
    openstack-origin: cloud:precise-havana
973
6
    source: cloud:precise-updates/havana
974
7
  services:
975
8
    ubuntu: 
976
9
      charm: cs:precise/ubuntu
977
10
      constraints: tags=nuc
978
11
    landscape-client:
979
12
      charm: cs:precise/landscape-client
980
13
      options:
981
14
        origin: ppa:landscape/trunk
982
15
        exchange-interval: 60
983
16
        urgent-exchange-interval: 30
984
17
        ping-interval: 10
985
18
        script-users: ALL
986
19
        include-manager-plugins: ScriptExecution
987
20
    lds:
988
21
      branch: lp:charms/lds-quickstart
989
22
      options:
990
23
        server_fqdn: lds.master
991
24
        admin_email: admin@lds.master
992
25
        admin_name: admin
993
26
        admin_password: Password1+
994
27
        license: include-file://license.txt
995
28
        sample_data: False
996
29
      constraints: tags=lds
997
30
    mysql:
998
31
      charm: cs:precise/mysql-29
999
32
      options:
1000
33
        dataset-size: 50%
1001
34
      to: lxc:ubuntu=0
1002
35
    rabbitmq-server:
1003
36
      charm: cs:precise/rabbitmq-server-16
1004
37
      constraints: mem=1G
1005
38
      to: lxc:ubuntu=0
1006
39
    keystone:
1007
40
      charm: cs:precise/keystone-23
1008
41
      options:
1009
42
        admin-password: Password1+
1010
43
        admin-token: ubuntutesting
1011
44
      to: lxc:ubuntu=0
1012
45
    openstack-dashboard:
1013
46
      charm: cs:precise/openstack-dashboard-11
1014
47
      options:
1015
48
        offline-compression: "no"
1016
49
        webroot: "/"
1017
50
      to: lxc:ubuntu=0
1018
51
    nova-compute:
1019
52
      charm: cs:precise/nova-compute
1020
53
      num_units: 7
1021
54
      options:
1022
55
        config-flags: "auto_assign_floating_ip=False"
1023
56
        enable-live-migration: False
1024
57
        virt-type: kvm
1025
58
      constraints: tags=nuc
1026
59
    nova-cloud-controller:
1027
60
      charm: cs:precise/nova-cloud-controller-19
1028
61
      options:
1029
62
        network-manager: Neutron
1030
63
        quantum-security-groups: "yes"
1031
64
      to: lxc:ubuntu=0
1032
65
    neutron-gateway:
1033
66
      charm: cs:precise/quantum-gateway-12
1034
67
      options:
1035
68
        ext-port: eth0
1036
69
      constraints: tags=neutron
1037
70
    cinder:
1038
71
      charm: cs:precise/cinder-14
1039
72
      options:
1040
73
        block-device: "/srv/cinder.img|40G"
1041
74
      constraints: tags=nuc
1042
75
    glance:
1043
76
      charm: cs:precise/glance-26
1044
77
      to: lxc:ubuntu=0
1045
78
    ceilometer:
1046
79
      charm: cs:precise/ceilometer
1047
80
      to: lxc:ubuntu=0
1048
81
    ceilometer-agent:
1049
82
      charm: cs:precise/ceilometer-agent
1050
83
    mongodb:
1051
84
      charm: cs:precise/mongodb
1052
85
      to: lxc:ubuntu=0
1053
86
    ntp:
1054
87
      charm: cs:precise/ntp
1055
88
  relations:
1056
89
    - - keystone
1057
90
      - mysql
1058
91
    - - nova-cloud-controller
1059
92
      - mysql
1060
93
    - - nova-cloud-controller
1061
94
      - rabbitmq-server
1062
95
    - - nova-cloud-controller
1063
96
      - glance
1064
97
    - - nova-cloud-controller
1065
98
      - keystone
1066
99
    - - nova-compute
1067
100
      - nova-cloud-controller
1068
101
    - - nova-compute
1069
102
      - mysql
1070
103
    - - nova-compute
1071
104
      - rabbitmq-server:amqp
1072
105
    - - nova-compute
1073
106
      - glance
1074
107
    - - glance
1075
108
      - mysql
1076
109
    - - glance
1077
110
      - keystone
1078
111
    - - glance
1079
112
      - cinder
1080
113
    - - cinder
1081
114
      - mysql
1082
115
    - - cinder
1083
116
      - rabbitmq-server
1084
117
    - - cinder
1085
118
      - nova-cloud-controller
1086
119
    - - cinder
1087
120
      - keystone
1088
121
    - - neutron-gateway
1089
122
      - mysql
1090
123
    - - neutron-gateway
1091
124
      - rabbitmq-server
1092
125
    - - neutron-gateway
1093
126
      - nova-cloud-controller
1094
127
    - - openstack-dashboard
1095
128
      - keystone
1096
129
    - - ceilometer
1097
130
      - keystone
1098
131
    - - ceilometer
1099
132
      - rabbitmq-server
1100
133
    - - ceilometer
1101
134
      - mongodb
1102
135
    - - ceilometer-agent:nova-ceilometer
1103
136
      - nova-compute:nova-ceilometer
1104
137
    - - ceilometer-agent:ceilometer-service
1105
138
      - ceilometer:ceilometer-service
1106
139
    - - ntp:juju-info
1107
140
      - nova-compute:juju-info
1108
141
    - - ntp:juju-info
1109
142
      - nova-cloud-controller:juju-info
1110
143
    - - ntp:juju-info
1111
144
      - neutron-gateway:juju-info
1112
145
    - - ntp:juju-info
1113
146
      - cinder:juju-info
1114
147
    - - ntp:juju-info
1115
148
      - keystone:juju-info
1116
149
    - - ntp:juju-info
1117
150
      - glance:juju-info
1118
151
    - - ntp:juju-info
1119
152
      - ceilometer:juju-info
1120
153
    - - ntp:juju-info
1121
154
      - mongodb:juju-info
1122
155
    - - ntp:juju-info
1123
156
      - rabbitmq-server:juju-info
1124
157
    - - ntp:juju-info
1125
158
      - mysql:juju-info
1126
159
    - - ntp:juju-info
1127
160
      - openstack-dashboard:juju-info
1128
161
    - - landscape-client:container
1129
162
      - [ lds, neutron-gateway, ubuntu, mysql, cinder, keystone, rabbitmq-server, glance, openstack-dashboard, nova-cloud-controller, ceilometer, mongodb, nova-compute ]
1130
163
    - - landscape-client:registration
1131
164
      - lds
1132
165
0
1133
=== removed directory 'usr/lib/orange-box/examples/openstack/complex/havana-swift'
1134
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-swift/01demo-prep.sh'
1135
=== target was u'../havana/01demo-prep.sh'
1136
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-swift/02deploy.sh'
1137
=== target was u'../havana/02deploy.sh'
1138
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-swift/03configure-cloud.sh'
1139
=== target was u'../havana/03configure-cloud.sh'
1140
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-swift/04cleanup.sh'
1141
=== target was u'../havana/04cleanup.sh'
1142
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-swift/README'
1143
=== target was u'../havana/README'
1144
=== removed file 'usr/lib/orange-box/examples/openstack/complex/havana-swift/bundle.yaml'
1145
--- usr/lib/orange-box/examples/openstack/complex/havana-swift/bundle.yaml	2014-06-10 23:44:37 +0000
1146
+++ usr/lib/orange-box/examples/openstack/complex/havana-swift/bundle.yaml	1970-01-01 00:00:00 +0000
1147
@@ -1,196 +0,0 @@
1148
1
# vim :set ts=2 et:
1149
2
openstack:
1150
3
  series: precise
1151
4
  overrides:
1152
5
    openstack-origin: cloud:precise-havana
1153
6
    source: cloud:precise-updates/havana
1154
7
  services:
1155
8
    ubuntu: 
1156
9
      charm: cs:precise/ubuntu
1157
10
      constraints: tags=nuc
1158
11
    landscape-client:
1159
12
      charm: cs:precise/landscape-client
1160
13
      options:
1161
14
        origin: ppa:landscape/trunk
1162
15
        exchange-interval: 60
1163
16
        urgent-exchange-interval: 30
1164
17
        ping-interval: 10
1165
18
        script-users: ALL
1166
19
        include-manager-plugins: ScriptExecution
1167
20
    lds:
1168
21
      branch: lp:charms/lds-quickstart
1169
22
      options:
1170
23
        server_fqdn: lds.master
1171
24
        admin_email: admin@lds.master
1172
25
        admin_name: admin
1173
26
        admin_password: Password1+
1174
27
        license: include-file://license.txt
1175
28
        sample_data: False
1176
29
      constraints: tags=lds
1177
30
    mysql:
1178
31
      charm: cs:precise/mysql-29
1179
32
      options:
1180
33
        dataset-size: 50%
1181
34
      to: lxc:ubuntu=0
1182
35
    rabbitmq-server:
1183
36
      charm: cs:precise/rabbitmq-server-16
1184
37
      constraints: mem=1G
1185
38
      to: lxc:ubuntu=0
1186
39
    keystone:
1187
40
      charm: cs:precise/keystone-23
1188
41
      options:
1189
42
        admin-password: Password1+
1190
43
        admin-token: ubuntutesting
1191
44
      to: lxc:ubuntu=0
1192
45
    openstack-dashboard:
1193
46
      charm: cs:precise/openstack-dashboard-11
1194
47
      options:
1195
48
        offline-compression: "no"
1196
49
        webroot: "/"
1197
50
      to: lxc:ubuntu=0
1198
51
    nova-compute:
1199
52
      charm: cs:precise/nova-compute
1200
53
      num_units: 5
1201
54
      options:
1202
55
        config-flags: "auto_assign_floating_ip=False"
1203
56
        enable-live-migration: False
1204
57
        virt-type: kvm
1205
58
      constraints: tags=nuc
1206
59
    nova-cloud-controller:
1207
60
      charm: cs:precise/nova-cloud-controller-19
1208
61
      options:
1209
62
        network-manager: Neutron
1210
63
        quantum-security-groups: "yes"
1211
64
      to: lxc:ubuntu=0
1212
65
    neutron-gateway:
1213
66
      charm: cs:precise/quantum-gateway-12
1214
67
      options:
1215
68
        ext-port: eth0
1216
69
      constraints: tags=neutron
1217
70
    cinder:
1218
71
      charm: cs:precise/cinder-14
1219
72
      options:
1220
73
        block-device: "/srv/cinder.img|40G"
1221
74
      constraints: tags=nuc
1222
75
    glance:
1223
76
      charm: cs:precise/glance-26
1224
77
      to: lxc:ubuntu=0
1225
78
    swift-proxy:
1226
79
      charm: cs:precise/swift-proxy
1227
80
      options:
1228
81
        zone-assignment: manual
1229
82
        replicas: 2
1230
83
        use-https: 'no'
1231
84
        swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
1232
85
      to: lxc:ubuntu=0
1233
86
    swift-storage-z1:
1234
87
      charm: cs:precise/swift-storage
1235
88
      options:
1236
89
        zone: 1
1237
90
        block-device: "/srv/swift.img|40G"
1238
91
      constraints: tags=nuc
1239
92
    swift-storage-z2:
1240
93
      charm: cs:precise/swift-storage
1241
94
      options:
1242
95
        zone: 2
1243
96
        block-device: "/srv/swift.img|40G"
1244
97
      constraints: tags=nuc
1245
98
    ceilometer:
1246
99
      charm: cs:precise/ceilometer
1247
100
      to: lxc:ubuntu=0
1248
101
    ceilometer-agent:
1249
102
      charm: cs:precise/ceilometer-agent
1250
103
    mongodb:
1251
104
      charm: cs:precise/mongodb
1252
105
      to: lxc:ubuntu=0
1253
106
    ntp:
1254
107
      charm: cs:precise/ntp
1255
108
  relations:
1256
109
    - - keystone
1257
110
      - mysql
1258
111
    - - nova-cloud-controller
1259
112
      - mysql
1260
113
    - - nova-cloud-controller
1261
114
      - rabbitmq-server
1262
115
    - - nova-cloud-controller
1263
116
      - glance
1264
117
    - - nova-cloud-controller
1265
118
      - keystone
1266
119
    - - nova-compute
1267
120
      - nova-cloud-controller
1268
121
    - - nova-compute
1269
122
      - mysql
1270
123
    - - nova-compute
1271
124
      - rabbitmq-server:amqp
1272
125
    - - nova-compute
1273
126
      - glance
1274
127
    - - glance
1275
128
      - mysql
1276
129
    - - glance
1277
130
      - keystone
1278
131
    - - glance
1279
132
      - cinder
1280
133
    - - cinder
1281
134
      - mysql
1282
135
    - - cinder
1283
136
      - rabbitmq-server
1284
137
    - - cinder
1285
138
      - nova-cloud-controller
1286
139
    - - cinder
1287
140
      - keystone
1288
141
    - - neutron-gateway
1289
142
      - mysql
1290
143
    - - neutron-gateway
1291
144
      - rabbitmq-server
1292
145
    - - neutron-gateway
1293
146
      - nova-cloud-controller
1294
147
    - - openstack-dashboard
1295
148
      - keystone
1296
149
    - - swift-proxy
1297
150
      - keystone
1298
151
    - - swift-proxy
1299
152
      - swift-storage-z1
1300
153
    - - swift-proxy
1301
154
      - swift-storage-z2
1302
155
    - - ceilometer
1303
156
      - keystone
1304
157
    - - ceilometer
1305
158
      - rabbitmq-server
1306
159
    - - ceilometer
1307
160
      - mongodb
1308
161
    - - ceilometer-agent:nova-ceilometer
1309
162
      - nova-compute:nova-ceilometer
1310
163
    - - ceilometer-agent:ceilometer-service
1311
164
      - ceilometer:ceilometer-service
1312
165
    - - ntp:juju-info
1313
166
      - nova-compute:juju-info
1314
167
    - - ntp:juju-info
1315
168
      - nova-cloud-controller:juju-info
1316
169
    - - ntp:juju-info
1317
170
      - neutron-gateway:juju-info
1318
171
    - - ntp:juju-info
1319
172
      - cinder:juju-info
1320
173
    - - ntp:juju-info
1321
174
      - keystone:juju-info
1322
175
    - - ntp:juju-info
1323
176
      - glance:juju-info
1324
177
    - - ntp:juju-info
1325
178
      - swift-proxy:juju-info
1326
179
    - - ntp:juju-info
1327
180
      - swift-storage-z1:juju-info
1328
181
    - - ntp:juju-info
1329
182
      - swift-storage-z2:juju-info
1330
183
    - - ntp:juju-info
1331
184
      - ceilometer:juju-info
1332
185
    - - ntp:juju-info
1333
186
      - mongodb:juju-info
1334
187
    - - ntp:juju-info
1335
188
      - rabbitmq-server:juju-info
1336
189
    - - ntp:juju-info
1337
190
      - mysql:juju-info
1338
191
    - - ntp:juju-info
1339
192
      - openstack-dashboard:juju-info
1340
193
    - - landscape-client:container
1341
194
      - [ lds, neutron-gateway, ubuntu, mysql, cinder, keystone, rabbitmq-server, glance, openstack-dashboard, nova-cloud-controller, ceilometer, mongodb, nova-compute, swift-proxy, swift-storage-z1, swift-storage-z2 ]
1342
195
    - - landscape-client:registration
1343
196
      - lds
1344
197
0
1345
=== removed file 'usr/lib/orange-box/examples/openstack/complex/havana/01demo-prep.sh'
1346
--- usr/lib/orange-box/examples/openstack/complex/havana/01demo-prep.sh	2014-06-10 23:44:37 +0000
1347
+++ usr/lib/orange-box/examples/openstack/complex/havana/01demo-prep.sh	1970-01-01 00:00:00 +0000
1348
@@ -1,13 +0,0 @@
1349
1
#!/bin/bash
1350
2
#Canonical Micro-Cluster Demo Preparation
1351
3
echo "checking for existing Juju environment..."
1352
4
juju status && echo "Existing deployment found, exiting." && exit
1353
5
1354
6
echo "Deploying Juju Bootstrap node to Virtual machine: juju.local using tags=juju"
1355
7
juju bootstrap --upload-tools=true --constraints "tags=juju"
1356
8
1357
9
echo "unset constraints"
1358
10
juju set-constraints tags=""
1359
11
echo "Deploying Juju-gui to bootstrap node"
1360
12
juju deploy --to 0 juju-gui
1361
13
1362
14
0
1363
=== removed file 'usr/lib/orange-box/examples/openstack/complex/havana/02deploy.sh'
1364
--- usr/lib/orange-box/examples/openstack/complex/havana/02deploy.sh	2014-06-10 23:44:37 +0000
1365
+++ usr/lib/orange-box/examples/openstack/complex/havana/02deploy.sh	1970-01-01 00:00:00 +0000
1366
@@ -1,31 +0,0 @@
1367
1
#!/bin/bash
1368
2
1369
3
set -ex
1370
4
if [ ! -d ~/landscape ]; then
1371
5
	bzr launchpad-login || ( echo "Please set your Launchpad login: bzr launchpad-login LAUNCHPAD_ID and re-run." && false )
1372
6
	bzr branch lp:landscape ~/landscape
1373
7
fi
1374
8
1375
9
if [ ! -f ~/license.txt ]; then
1376
10
	(echo "Need to create license.txt" && false)
1377
11
else
1378
12
	cp ~/license.txt ./license.txt
1379
13
fi
1380
14
1381
15
if [ ! -d precise/lds ]; then
1382
16
  mkdir -p precise
1383
17
  cp -r ~/landscape/dev/charms/precise/lds-quickstart precise/lds
1384
18
  (
1385
19
    cd precise/lds
1386
20
    bzr init
1387
21
    bzr add
1388
22
    bzr commit -m "Fake lds charm"
1389
23
  )
1390
24
fi
1391
25
1392
26
juju-deployer -c bundle.yaml -d
1393
27
1394
28
# NOTE: add relation not encompassed in bundle
1395
29
juju add-relation landscape-client:container juju-gui
1396
30
1397
31
echo "Deployment finished"
1398
32
0
1399
=== removed file 'usr/lib/orange-box/examples/openstack/complex/havana/03configure-cloud.sh'
1400
--- usr/lib/orange-box/examples/openstack/complex/havana/03configure-cloud.sh	2014-06-10 23:44:37 +0000
1401
+++ usr/lib/orange-box/examples/openstack/complex/havana/03configure-cloud.sh	1970-01-01 00:00:00 +0000
1402
@@ -1,17 +0,0 @@
1403
1
#!/bin/bash
1404
2
1405
3
echo "Configuring Openstack environment"
1406
4
cd ../openstack-configuration/
1407
5
1408
6
[ -f ~/images/precise-server-cloudimg-amd64-disk1.img ] || ./get-cloud-images
1409
7
1410
8
./inspect-environment
1411
9
source envrc
1412
10
1413
11
./prepare-cloud havana
1414
12
1415
13
echo "Configuring Juju environment"
1416
14
cd ../juju-config/
1417
15
./generate-jujuenv
1418
16
1419
17
1420
18
0
1421
=== removed file 'usr/lib/orange-box/examples/openstack/complex/havana/04cleanup.sh'
1422
--- usr/lib/orange-box/examples/openstack/complex/havana/04cleanup.sh	2014-06-10 23:44:37 +0000
1423
+++ usr/lib/orange-box/examples/openstack/complex/havana/04cleanup.sh	1970-01-01 00:00:00 +0000
1424
@@ -1,30 +0,0 @@
1425
1
#!/bin/bash
1426
2
1427
3
juju destroy-environment maas
1428
4
1429
5
#Need to remove the Juju environments
1430
6
rm -rf ~/.juju/
1431
7
1432
8
#Removing known hosts as all keys will be regenerated when re-deploying.
1433
9
rm ~/.ssh/known_hosts
1434
10
1435
11
#Now re-create MAAS Juju environment.
1436
12
mkdir ~/.juju
1437
13
1438
14
maas_oauth=$(maas-cli list | awk '{ print $3 }')
1439
15
1440
16
cat > ~/.juju/environments.yaml <<EOF
1441
17
environments:
1442
18
    maas:
1443
19
        type: maas
1444
20
        admin-secret: Password1+
1445
21
1446
22
        # maas-server specifies the location of the MAAS server. It must
1447
23
        # specify the base path.
1448
24
        maas-server: 'http://10.14.4.1/MAAS/'
1449
25
        
1450
26
        # maas-oauth holds the OAuth credentials from MAAS.
1451
27
        maas-oauth: '$maas_oauth'
1452
28
EOF
1453
29
1454
30
1455
31
0
1456
=== removed file 'usr/lib/orange-box/examples/openstack/complex/havana/README'
1457
--- usr/lib/orange-box/examples/openstack/complex/havana/README	2014-06-10 23:44:37 +0000
1458
+++ usr/lib/orange-box/examples/openstack/complex/havana/README	1970-01-01 00:00:00 +0000
1459
@@ -1,6 +0,0 @@
1460
1
This demo bundle deploys Openstack Havana with Ceph and Swift and Ceilometer with LDS
1461
2
1462
3
01pre-deploy.sh - deploys Juju bootstrap and the Juju GUI
1463
4
02deploy.sh - deploys the Openstack Bundle
1464
5
03configure-cloud.sh - sets up networks and uploads an image and configures the Juju environment for Openstack as the default.
1465
6
04cleanup.sh - destroys the MAAS Juju environment
1466
7
0
1467
=== removed file 'usr/lib/orange-box/examples/openstack/complex/havana/bundle.yaml'
1468
--- usr/lib/orange-box/examples/openstack/complex/havana/bundle.yaml	2014-06-10 23:44:37 +0000
1469
+++ usr/lib/orange-box/examples/openstack/complex/havana/bundle.yaml	1970-01-01 00:00:00 +0000
1470
@@ -1,214 +0,0 @@
1471
1
# vim :set ts=2 et:
1472
2
openstack:
1473
3
  series: precise
1474
4
  overrides:
1475
5
    openstack-origin: cloud:precise-havana
1476
6
    source: cloud:precise-updates/havana
1477
7
  services:
1478
8
    ubuntu: 
1479
9
      charm: cs:precise/ubuntu
1480
10
      constraints: tags=nuc
1481
11
    landscape-client:
1482
12
      charm: cs:precise/landscape-client
1483
13
      options:
1484
14
        origin: ppa:landscape/trunk
1485
15
        exchange-interval: 60
1486
16
        urgent-exchange-interval: 30
1487
17
        ping-interval: 10
1488
18
        script-users: ALL
1489
19
        include-manager-plugins: ScriptExecution
1490
20
    lds:
1491
21
      branch: lp:charms/lds-quickstart
1492
22
      options:
1493
23
        server_fqdn: lds.master
1494
24
        admin_email: admin@lds.master
1495
25
        admin_name: admin
1496
26
        admin_password: Password1+
1497
27
        license: include-file://license.txt
1498
28
        sample_data: False
1499
29
      constraints: tags=lds
1500
30
    mysql:
1501
31
      charm: cs:precise/mysql-29
1502
32
      options:
1503
33
        dataset-size: 50%
1504
34
      to: lxc:ubuntu=0
1505
35
    rabbitmq-server:
1506
36
      charm: cs:precise/rabbitmq-server-16
1507
37
      constraints: mem=1G
1508
38
      to: lxc:ubuntu=0
1509
39
    ceph:
1510
40
      charm: cs:precise/ceph
1511
41
      num_units: 3
1512
42
      options:
1513
43
        monitor-count: 3
1514
44
        fsid: 9e7aac42-4bf4-11e3-b4b7-5254006a039c
1515
45
        monitor-secret: AQAAvoJSOAv/NRAAgvXP8d7iXN7lWYbvDZzm2Q==
1516
46
        osd-devices: /srv
1517
47
        osd-reformat: "yes"
1518
48
      constraints: tags=nuc
1519
49
    keystone:
1520
50
      charm: cs:precise/keystone-23
1521
51
      options:
1522
52
        admin-password: Password1+
1523
53
        admin-token: ubuntutesting
1524
54
      to: lxc:ubuntu=0
1525
55
    openstack-dashboard:
1526
56
      charm: cs:precise/openstack-dashboard-11
1527
57
      options:
1528
58
        offline-compression: "no"
1529
59
        webroot: "/"
1530
60
      to: lxc:ubuntu=0
1531
61
    nova-compute:
1532
62
      charm: cs:precise/nova-compute
1533
63
      num_units: 3
1534
64
      options:
1535
65
        config-flags: "auto_assign_floating_ip=False"
1536
66
        enable-live-migration: False
1537
67
        virt-type: kvm
1538
68
      constraints: tags=nuc
1539
69
    nova-cloud-controller:
1540
70
      charm: cs:precise/nova-cloud-controller-19
1541
71
      options:
1542
72
        network-manager: Neutron
1543
73
        quantum-security-groups: "yes"
1544
74
      to: lxc:ubuntu=0
1545
75
    neutron-gateway:
1546
76
      charm: cs:precise/quantum-gateway-12
1547
77
      options:
1548
78
        ext-port: eth0
1549
79
      constraints: tags=neutron
1550
80
    cinder:
1551
81
      charm: cs:precise/cinder-14
1552
82
      options:
1553
83
        block-device: "None"
1554
84
      to: lxc:ubuntu=0
1555
85
    glance:
1556
86
      charm: cs:precise/glance-26
1557
87
      to: lxc:ubuntu=0
1558
88
    swift-proxy:
1559
89
      charm: cs:precise/swift-proxy
1560
90
      options:
1561
91
        zone-assignment: manual
1562
92
        replicas: 2
1563
93
        use-https: 'no'
1564
94
        swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
1565
95
      to: lxc:ubuntu=0
1566
96
    swift-storage-z1:
1567
97
      charm: cs:precise/swift-storage
1568
98
      options:
1569
99
        zone: 1
1570
100
        block-device: "/srv/swift.img|40G"
1571
101
      constraints: tags=nuc
1572
102
    swift-storage-z2:
1573
103
      charm: cs:precise/swift-storage
1574
104
      options:
1575
105
        zone: 2
1576
106
        block-device: "/srv/swift.img|40G"
1577
107
      constraints: tags=nuc
1578
108
    ceilometer:
1579
109
      charm: cs:precise/ceilometer
1580
110
      to: lxc:ubuntu=0
1581
111
    ceilometer-agent:
1582
112
      charm: cs:precise/ceilometer-agent
1583
113
    mongodb:
1584
114
      charm: cs:precise/mongodb
1585
115
      to: lxc:ubuntu=0
1586
116
    ntp:
1587
117
      charm: cs:precise/ntp
1588
118
  relations:
1589
119
    - - keystone
1590
120
      - mysql
1591
121
    - - nova-cloud-controller
1592
122
      - mysql
1593
123
    - - nova-cloud-controller
1594
124
      - rabbitmq-server
1595
125
    - - nova-cloud-controller
1596
126
      - glance
1597
127
    - - nova-cloud-controller
1598
128
      - keystone
1599
129
    - - nova-compute
1600
130
      - nova-cloud-controller
1601
131
    - - nova-compute
1602
132
      - mysql
1603
133
    - - nova-compute
1604
134
      - rabbitmq-server:amqp
1605
135
    - - nova-compute
1606
136
      - glance
1607
137
    - - nova-compute
1608
138
      - ceph
1609
139
    - - glance
1610
140
      - mysql
1611
141
    - - glance
1612
142
      - keystone
1613
143
    - - glance
1614
144
      - ceph
1615
145
    - - glance
1616
146
      - cinder
1617
147
    - - cinder
1618
148
      - mysql
1619
149
    - - cinder
1620
150
      - rabbitmq-server
1621
151
    - - cinder
1622
152
      - nova-cloud-controller
1623
153
    - - cinder
1624
154
      - keystone
1625
155
    - - cinder
1626
156
      - ceph
1627
157
    - - neutron-gateway
1628
158
      - mysql
1629
159
    - - neutron-gateway
1630
160
      - rabbitmq-server
1631
161
    - - neutron-gateway
1632
162
      - nova-cloud-controller
1633
163
    - - openstack-dashboard
1634
164
      - keystone
1635
165
    - - swift-proxy
1636
166
      - keystone
1637
167
    - - swift-proxy
1638
168
      - swift-storage-z1
1639
169
    - - swift-proxy
1640
170
      - swift-storage-z2
1641
171
    - - ceilometer
1642
172
      - keystone
1643
173
    - - ceilometer
1644
174
      - rabbitmq-server
1645
175
    - - ceilometer
1646
176
      - mongodb
1647
177
    - - ceilometer-agent:nova-ceilometer
1648
178
      - nova-compute:nova-ceilometer
1649
179
    - - ceilometer-agent:ceilometer-service
1650
180
      - ceilometer:ceilometer-service
1651
181
    - - ntp:juju-info
1652
182
      - nova-compute:juju-info
1653
183
    - - ntp:juju-info
1654
184
      - nova-cloud-controller:juju-info
1655
185
    - - ntp:juju-info
1656
186
      - neutron-gateway:juju-info
1657
187
    - - ntp:juju-info
1658
188
      - ceph:juju-info
1659
189
    - - ntp:juju-info
1660
190
      - cinder:juju-info
1661
191
    - - ntp:juju-info
1662
192
      - keystone:juju-info
1663
193
    - - ntp:juju-info
1664
194
      - glance:juju-info
1665
195
    - - ntp:juju-info
1666
196
      - swift-proxy:juju-info
1667
197
    - - ntp:juju-info
1668
198
      - swift-storage-z1:juju-info
1669
199
    - - ntp:juju-info
1670
200
      - swift-storage-z2:juju-info
1671
201
    - - ntp:juju-info
1672
202
      - ceilometer:juju-info
1673
203
    - - ntp:juju-info
1674
204
      - mongodb:juju-info
1675
205
    - - ntp:juju-info
1676
206
      - rabbitmq-server:juju-info
1677
207
    - - ntp:juju-info
1678
208
      - mysql:juju-info
1679
209
    - - ntp:juju-info
1680
210
      - openstack-dashboard:juju-info
1681
211
    - - landscape-client:container
1682
212
      - [ lds, neutron-gateway, ubuntu, mysql, cinder, keystone, rabbitmq-server, glance, openstack-dashboard, nova-cloud-controller, ceilometer, mongodb, nova-compute, ceph, swift-proxy, swift-storage-z1, swift-storage-z2 ]
1683
213
    - - landscape-client:registration
1684
214
      - lds
1685
215
0
1686
=== removed directory 'usr/lib/orange-box/examples/openstack/complex/juju-config'
1687
=== removed file 'usr/lib/orange-box/examples/openstack/complex/juju-config/environments.yaml'
1688
--- usr/lib/orange-box/examples/openstack/complex/juju-config/environments.yaml	2014-06-10 23:44:37 +0000
1689
+++ usr/lib/orange-box/examples/openstack/complex/juju-config/environments.yaml	1970-01-01 00:00:00 +0000
1690
@@ -1,13 +0,0 @@
1691
1
default: openstack
1692
2
environments:
1693
3
  openstack:
1694
4
    type: openstack
1695
5
    control-bucket: __UUID__
1696
6
    admin-secret: Password1+
1697
7
    auth-url: __AUTH_URL__
1698
8
    region: RegionOne
1699
9
    image-metadata-url: http://10.14.4.1/images/
1700
10
    username: admin
1701
11
    password: Password1+
1702
12
    tenant-name: admin
1703
13
    use-floating-ip: true
1704
14
0
1705
=== removed file 'usr/lib/orange-box/examples/openstack/complex/juju-config/generate-jujuenv'
1706
--- usr/lib/orange-box/examples/openstack/complex/juju-config/generate-jujuenv	2014-06-10 23:44:37 +0000
1707
+++ usr/lib/orange-box/examples/openstack/complex/juju-config/generate-jujuenv	1970-01-01 00:00:00 +0000
1708
@@ -1,37 +0,0 @@
1709
1
#!/bin/bash
1710
2
1711
3
set -e
1712
4
1713
5
grep openstack ~/.juju/environments.yaml &&  echo "Openstack already configured in ~/.juju/environments.yaml" && exit 
1714
6
1715
7
source ../openstack-configuration/envrc
1716
8
1717
9
#Backup environments.yaml
1718
10
cp ~/.juju/environments.yaml ~/.juju/environments.yaml.bak
1719
11
1720
12
sed -e "s/__UUID__/$(uuid)/g" -e "s!__AUTH_URL__!http://$KEYSTONE_HOST:5000/v2.0/!g"  environments.yaml >> ~/.juju/environments.yaml
1721
13
1722
14
echo "Default Juju environment is now: openstack"
1723
15
1724
16
echo "Generating Juju meta-data"
1725
17
juju-metadata generate-image -a amd64 -u ${OS_AUTH_URL?} -i $IMAGE_UUID -r $OS_REGION_NAME -s precise 
1726
18
1727
19
echo "Copying data to web server"
1728
20
sudo cp -r images /var/www/html/
1729
21
sudo chmod -R go+r /var/www/html/images
1730
22
1731
23
echo "Validating Juju Image Metadata"
1732
24
juju-metadata validate-images
1733
25
1734
26
echo "Remove m1.tiny as it is too small for an Ubuntu Cloud Image and Juju defaults to the smallest flavor"
1735
27
nova flavor-list | grep m1.tiny && nova flavor-delete m1.tiny
1736
28
1737
29
echo "Fixup DNS nameservers to point to 172.16.1.1 for Neutron subnets"
1738
30
#Get subnet IDs
1739
31
neutron subnet-update admin_net_subnet --dns_nameservers list=true 172.16.1.1
1740
32
neutron subnet-update ext_net_subnet --dns_nameservers list=true 172.16.1.1
1741
33
1742
34
echo "Ready to bootstrap Juju"
1743
35
echo "juju bootstrap --upload-tools=true"
1744
36
1745
37
1746
38
0
1747
=== removed directory 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration'
1748
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/README'
1749
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/README	2014-06-10 23:44:37 +0000
1750
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/README	1970-01-01 00:00:00 +0000
1751
@@ -1,21 +0,0 @@
1752
1
OpenStack Cloud Setup and Test
1753
2
------------------------------
1754
3
1755
4
1) Inspect the deployed cloud
1756
5
1757
6
./inspect-environment
1758
7
source envrc
1759
8
1760
9
2) Prepare the cloud
1761
10
1762
11
./prepare-cloud havana
1763
12
source envrc
1764
13
1765
14
3) Verify the cloud
1766
15
1767
16
./verify-cloud
1768
17
1769
18
NOTES:
1770
19
1771
20
verify-cloud currently clones devstack from github.
1772
21
1773
22
0
1774
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/configure-tests'
1775
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/configure-tests	2014-06-10 23:44:37 +0000
1776
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/configure-tests	1970-01-01 00:00:00 +0000
1777
@@ -1,6 +0,0 @@
1778
1
#!/bin/bash -e
1779
2
1780
3
base=$(dirname $0)
1781
4
rm -rf etc
1782
5
cp -r ${base}/etc_master etc
1783
6
${base}/configure_tests.py --configure etc
1784
7
0
1785
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/configure_tests.py'
1786
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/configure_tests.py	2014-06-10 23:44:37 +0000
1787
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/configure_tests.py	1970-01-01 00:00:00 +0000
1788
@@ -1,60 +0,0 @@
1789
1
#!/usr/bin/python
1790
2
1791
3
import optparse
1792
4
import logging
1793
5
import os
1794
6
import sys
1795
7
import string
1796
8
import subprocess
1797
9
import re
1798
10
1799
11
1800
12
def list_configs(conf_dir):
1801
13
    confs = []
1802
14
    for f in os.listdir(conf_dir):
1803
15
        if os.path.isdir(os.path.join(conf_dir, f)):
1804
16
            confs += list_configs(os.path.join(conf_dir, f))
1805
17
        if f.endswith('.conf'):
1806
18
            confs.append(os.path.join(conf_dir, f))
1807
19
    return confs
1808
20
1809
21
def update_test_configs(conf_dir):
1810
22
    if not os.path.exists(conf_dir):
1811
23
        die('Config directory does not exist at %s' % conf_dir)
1812
24
    vars_file = os.path.join(conf_dir, 'all_variables')
1813
25
    if not os.path.isfile(vars_file):
1814
26
        die('Could not load all_variables from %s' % vars_file)
1815
27
1816
28
    env_vars = []
1817
29
    for l in open(vars_file, 'r').readlines():
1818
30
        if not l.startswith('#') and l.strip() != '':
1819
31
            env_vars.append(l.strip())
1820
32
1821
33
    config_files = list_configs(conf_dir)
1822
34
1823
35
    for var in env_vars:
1824
36
        if var in os.environ:
1825
37
            val = os.environ[var]
1826
38
            for f in config_files:
1827
39
                sep = ","
1828
40
                if re.search(",", val):
1829
41
                    sep = "/"
1830
42
                cmd = 'sed -i s%(sep)s%%%(var)s%%%(sep)s%(val)s%(sep)sg %(f)s' % locals()
1831
43
                subprocess.check_output(cmd.split(' '))
1832
44
        else:
1833
45
            print "[WARN] Not setting %s in config, could not find in environment."\
1834
46
                % var
1835
47
    print "Configured tests in %s" % conf_dir
1836
48
1837
49
parser = optparse.OptionParser()
1838
50
parser.add_option('-C', '--configure', dest='configure', action='store_true',
1839
51
                  default=False,
1840
52
                  help='Configure all test configs based on enviornment.')
1841
53
(options, args) = parser.parse_args()
1842
54
1843
55
if options.configure:
1844
56
    if len(args) == 0:
1845
57
        die('Must pass a directory as argument to --configure')
1846
58
1847
59
    conf_dir=args.pop()
1848
60
    update_test_configs(conf_dir)
1849
61
0
1850
=== removed directory 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack'
1851
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/__init__.py'
1852
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/config.py'
1853
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/config.py	2014-06-10 23:44:37 +0000
1854
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/config.py	1970-01-01 00:00:00 +0000
1855
@@ -1,103 +0,0 @@
1856
1
import ConfigParser
1857
2
import os
1858
3
import subprocess
1859
4
import logging
1860
5
import jinja2
1861
6
1862
7
from test_utils.config import CloudConfig
1863
8
1864
9
cloud_config = CloudConfig()
1865
10
1866
11
DEFAULT_CONFIG='etc/devstack.conf'
1867
12
DEFAULT_WORK_DIR=os.path.join(os.environ['HOME'], 'devstack-test')
1868
13
1869
14
class DevstackConfig(object):
1870
15
    def __init__(self, conf=DEFAULT_CONFIG, work_dir=DEFAULT_WORK_DIR):
1871
16
        self.config = ConfigParser.SafeConfigParser()
1872
17
        self.config.read(conf)
1873
18
1874
19
        self.work_dir = work_dir
1875
20
        if not os.path.exists(self.work_dir):
1876
21
            os.makedirs(self.work_dir)
1877
22
1878
23
        self.devstack_dir = os.path.join(self.work_dir, 'devstack')
1879
24
        self.git_repo = self.config.get('DEFAULT', 'devstack_repo')
1880
25
1881
26
        templ_dir = self.config.get('DEFAULT', 'templates')
1882
27
        templ_dir = os.path.join(os.getcwd(), templ_dir)
1883
28
        if not os.path.exists(templ_dir):
1884
29
            logging.error('Could not locate devstack template directory @ %s'\
1885
30
                        % templ_dir)
1886
31
            raise
1887
32
        loader = jinja2.FileSystemLoader(templ_dir)
1888
33
        self.templates = jinja2.Environment(loader = loader)
1889
34
        self.git_branch = self.config.get('DEFAULT', 'devstack_branch')
1890
35
1891
36
    def get(self, item, section='DEFAULT'):
1892
37
        return self.config.get(section, item)
1893
38
1894
39
    def prepare_devstack(self):
1895
40
        self._clone_devstack(directory=self.devstack_dir)
1896
41
        self._write_openrc(branch=self.git_branch, directory=self.devstack_dir)
1897
42
        self._write_exerciserc()
1898
43
1899
44
    def _clone_devstack(self, directory=None, branch=None):
1900
45
        if not directory:
1901
46
            directory = self.devstack_dir
1902
47
        if not branch:
1903
48
            branch = self.git_branch
1904
49
        cmd = [ 'git', 'clone', self.git_repo, directory ]
1905
50
        subprocess.check_output(cmd)
1906
51
1907
52
        if branch != 'master':
1908
53
            os.chdir(directory)
1909
54
            cmd = [ 'git', 'checkout', branch ]
1910
55
            subprocess.check_output(cmd)
1911
56
1912
57
    def _write_openrc(self, branch='master', directory=None):
1913
58
        ''' Write openrc template to specified directory.
1914
59
            branch is definied in config.
1915
60
            branch names are expected to be in git format.
1916
61
            _'s will be substited for /'s in template name,
1917
62
            ie, branch='stable/essex' -> $directory/openrc.stable_essex
1918
63
        '''
1919
64
        if not directory:
1920
65
            directory = self.devstack_dir
1921
66
        git_branch = ""
1922
67
        for i in branch:
1923
68
            if i == '/':
1924
69
                git_branch += '_'
1925
70
            else:
1926
71
                git_branch += i
1927
72
1928
73
        openrc = os.path.join(directory, 'openrc')
1929
74
        templ = self.templates.get_template('openrc.%s' % git_branch)
1930
75
        context = { 'nova_host': cloud_config.get('DEFAULT', 'nova_host'),
1931
76
                    'glance_host': cloud_config.get('DEFAULT', 'glance_host'),
1932
77
                    'keystone_host': cloud_config.get('DEFAULT', 'keystone_host'),
1933
78
                    'service_host': cloud_config.get('DEFAULT', 'service_host'),
1934
79
                    'os_username': cloud_config.get('osapi', 'username'),
1935
80
                    'os_password': cloud_config.get('osapi', 'password'),
1936
81
                    'os_tenant_name': cloud_config.get('osapi', 'tenant_name'),
1937
82
                    'secondary_ip_pool': self.get('secondary_ip_pool'),
1938
83
                    'enabled_services': self.get('enabled_services')
1939
84
                  }
1940
85
        f = open(openrc, 'w')
1941
86
        f.write(templ.render(context))
1942
87
        f.close()
1943
88
1944
89
    def _write_exerciserc(self, directory=None):
1945
90
        ''' Write out the exerciserc file based on whats in config.'''
1946
91
        if not directory:
1947
92
            directory = self.devstack_dir
1948
93
        exerciserc = os.path.join(directory, 'exerciserc')
1949
94
        templ = self.templates.get_template('exerciserc')
1950
95
        context = { 'active_timeout': self.get('active_timeout'),
1951
96
                    'associate_timeout': self.get('associate_timeout'),
1952
97
                    'boot_timeout': self.get('boot_timeout'),
1953
98
                    'running_timeout': self.get('running_timeout'),
1954
99
                    'terminate_timeout': self.get('terminate_timeout')
1955
100
        }
1956
101
        f = open(exerciserc, 'w')
1957
102
        f.write(templ.render(context))
1958
103
        f.close()
1959
104
0
1960
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_devstack_exercises.py'
1961
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_devstack_exercises.py	2014-06-10 23:44:37 +0000
1962
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_devstack_exercises.py	1970-01-01 00:00:00 +0000
1963
@@ -1,105 +0,0 @@
1964
1
import unittest
1965
2
import shutil
1966
3
import os
1967
4
import nose
1968
5
import subprocess
1969
6
import sys
1970
7
import logging
1971
8
1972
9
from test_utils.config import CloudConfig
1973
10
from config import DevstackConfig
1974
11
1975
12
WORK_DIR='/tmp/devstack-test'
1976
13
1977
14
cloud_config = CloudConfig()
1978
15
1979
16
class DevstackExcercises(unittest.TestCase):
1980
17
    @classmethod
1981
18
    def setUpClass(self):
1982
19
        try:
1983
20
            self.artifacts_dir = cloud_config.get('tests', 'artifacts_dir')
1984
21
        except:
1985
22
            self.artifacts_dir = None
1986
23
        if self.artifacts_dir:
1987
24
            if os.path.isdir(self.artifacts_dir):
1988
25
                shutil.rmtree(self.artifacts_dir)
1989
26
            os.mkdir(self.artifacts_dir)
1990
27
        if os.path.exists(WORK_DIR):
1991
28
            logging.debug("Removing existing work_dir @ %s" % WORK_DIR)
1992
29
            shutil.rmtree(WORK_DIR)
1993
30
        self.devstack  = DevstackConfig(work_dir=WORK_DIR)
1994
31
        self.devstack.prepare_devstack()
1995
32
1996
33
1997
34
    def _call_exercise(self, exercise):
1998
35
        os.chdir(self.devstack.devstack_dir)
1999
36
        exercise_script = './exercises/%s' % exercise
2000
37
2001
38
        if not os.path.isfile(exercise_script):
2002
39
            # Skip exercise if it is not found (its probably hosted
2003
40
            #  in another branch of devstack)
2004
41
            raise nose.SkipTest('Skipping %s, exercise script not found in '\
2005
42
                                ' this branch.' % exercise_script)
2006
43
2007
44
        try:
2008
45
            archive_logs = cloud_config.get('tests', 'archive_logs')
2009
46
        except:
2010
47
            archive_logs = False
2011
48
2012
49
        if archive_logs in ['True', 'true']:
2013
50
            log = os.path.join(self.artifacts_dir, 'devstack_ex_%s.log' %\
2014
51
                               exercise)
2015
52
            log = open(log, 'wb')
2016
53
            t_stdout = t_stderr = log
2017
54
        else:
2018
55
            t_stdout = t_stderr = subprocess.PIPE
2019
56
2020
57
        p = subprocess.Popen(exercise_script,
2021
58
                             stdout=t_stdout, stderr=t_stderr)
2022
59
        p.poll()
2023
60
        (stdout, stderr) = p.communicate()
2024
61
        if p.returncode == 0:
2025
62
            return True
2026
63
        elif p.returncode == 55:
2027
64
            # Exercises that return 55 do so because the target service is
2028
65
            # not enabled, via ENABLED_SERVICES.
2029
66
            raise nose.SkipTest('Service not enabled, skipping test.')
2030
67
        else:
2031
68
            logging.debug('--- Exercise %s failed with RC %s.'\
2032
69
                           % (exercise,  p.returncode))
2033
70
            logging.debug('Debug output:')
2034
71
            logging.debug(stdout)
2035
72
            logging.debug(stderr)
2036
73
            return False
2037
74
2038
75
    def test_aggregates(self):
2039
76
        '''test_aggregates: Test host aggregates'''
2040
77
        self.assertTrue(self._call_exercise('aggregates.sh'))
2041
78
2042
79
    def test_client_env(self):
2043
80
        '''test_client_env: Test OpenStack client enviroment variable handling'''
2044
81
        self.assertTrue(self._call_exercise('client-env.sh'))
2045
82
2046
83
    def test_floating_ips(self):
2047
84
        '''test_floating_ips: Test instance spawn + IP association via OSAPI'''
2048
85
        self.assertTrue(self._call_exercise('floating_ips.sh'))
2049
86
2050
87
    def test_volumes(self):
2051
88
        '''test_volumes: Test instance spawn + volume attachment via OSAPI'''
2052
89
        self.assertTrue(self._call_exercise('volumes.sh'))
2053
90
2054
91
    def test_sec_groups(self):
2055
92
        '''test_sec_groups: Test security groups via the command line tools'''
2056
93
        self.assertTrue(self._call_exercise('sec_groups.sh'))
2057
94
2058
95
    def test_horizon(self):
2059
96
        '''test_horizon: Ensure horizon displays a login page.'''
2060
97
        self.assertTrue(self._call_exercise('horizon.sh'))
2061
98
2062
99
    def test_boot_from_volume(self):
2063
100
        '''test_boot_from_volume: Test instance spawn from cinder volume.'''
2064
101
        self.assertTrue(self._call_exercise('boot_from_volume.sh'))
2065
102
2066
103
    def test_swift(self):
2067
104
        '''test_swift: Ensure swift object storage if functional.'''
2068
105
        self.assertTrue(self._call_exercise('swift.sh'))
2069
106
0
2070
=== removed directory 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils'
2071
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/__init__.py'
2072
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/cloud.py'
2073
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/cloud.py	2014-06-10 23:44:37 +0000
2074
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/cloud.py	1970-01-01 00:00:00 +0000
2075
@@ -1,351 +0,0 @@
2076
1
2077
2
import json
2078
3
import urlparse
2079
4
import uuid
2080
5
import sys
2081
6
import time
2082
7
import logging
2083
8
from copy import copy, deepcopy
2084
9
2085
10
from openstack_ubuntu_testing.test_utils.config import CloudConfig
2086
11
2087
12
from boto import exception, connect_ec2
2088
13
from boto.ec2.regioninfo import RegionInfo
2089
14
2090
15
from novaclient.v1_1.client import Client as OSNovaClient
2091
16
from cinderclient.v1.client import Client as OSCinderClient
2092
17
2093
18
INST_RUN_TIMEOUT = 120
2094
19
INST_TERMINATE_TIMEOUT=60
2095
20
VOL_CREATE_TIMEOUT = 30
2096
21
VOL_ATTACH_TIMEOUT = 30
2097
22
2098
23
def _normalize_ec2(d):
2099
24
    '''convert all values of dict to a string'''
2100
25
    out = {}
2101
26
    for k, v in out.iteritems():
2102
27
        if 'object at' in str(v):
2103
28
            out.pop(k)
2104
29
        elif isinstance(v, dict):
2105
30
            out[k] = _normalize_ec2(v)
2106
31
        else:
2107
32
            out[k] = str(v)
2108
33
    return out
2109
34
2110
35
2111
36
def _normalize_osapi(d):
2112
37
    '''
2113
38
    'ensure everythign in dict is a string, and remove any object references.
2114
39
    '''
2115
40
    out = {}
2116
41
    # these are known to hold references to objects in memory, remove them.
2117
42
    black_list = ['manager']
2118
43
    for k, v in d.iteritems():
2119
44
        if k in black_list:
2120
45
            continue
2121
46
        out[k] = str(v)
2122
47
    return out
2123
48
2124
49
2125
50
2126
51
_resources = {
2127
52
    'ec2': {
2128
53
        'instances': [],
2129
54
        'floating_ips': [],
2130
55
        'key_pairs': [],
2131
56
        'volumes': [],
2132
57
    },
2133
58
    'osapi': {
2134
59
        'instances': [],
2135
60
        'floating_ips': [],
2136
61
        'key_pairs': [],
2137
62
        'volumes': [],
2138
63
    }
2139
64
}
2140
65
2141
66
class EC2CloudClient(object):
2142
67
    def __init__(self, access_key, secret_key, endpoint):
2143
68
        url = urlparse.urlparse(endpoint)
2144
69
        sec = False
2145
70
        if url.scheme == 'https':
2146
71
            sec = True
2147
72
        region = RegionInfo(name='nova', endpoint=url.hostname)
2148
73
        self.api = connect_ec2(access_key, secret_key, host=url.hostname,
2149
74
                          port=url.port, path=url.path, is_secure=sec,
2150
75
                          region=region)
2151
76
2152
77
        # track IDs of created resources for tear-down.
2153
78
        self.instances = []
2154
79
        self.key_pairs = []
2155
80
        self.floating_ips =[]
2156
81
        self.volumes = []
2157
82
2158
83
    def instance_ids(self):
2159
84
        ids = []
2160
85
        for reservation in self.api.get_all_instances():
2161
86
            [ids.append(i.id) for i in reservation.instances]
2162
87
        return ids
2163
88
2164
89
    def instances_running(self, instance_ids=[]):
2165
90
        '''given a list of instance_ids, return list of only running instances'''
2166
91
        running = []
2167
92
        reservations = []
2168
93
        for id in instance_ids:
2169
94
            try:
2170
95
                reservations.append(self.api.get_all_instances(instance_ids=str(id)))
2171
96
            except exception.EC2ResponseError:
2172
97
                instance_ids.remove(id)
2173
98
2174
99
        instances = []
2175
100
        for r in reservations:
2176
101
            if len(r) > 0 and r[0].instances:
2177
102
                instances.append(r[0].instances[0])
2178
103
2179
104
        for instance in instances:
2180
105
            if instance.state == 'running':
2181
106
                running.append(instance.id)
2182
107
        return running
2183
108
2184
109
2185
110
    def get_images(self):
2186
111
        images = {}
2187
112
        [images.update({i.id: _normalize_ec2(vars(i))})
2188
113
         for i in self.api.get_all_images()]
2189
114
        return images
2190
115
2191
116
2192
117
    def get_key_pairs(self):
2193
118
        kps = {}
2194
119
        [kps.update({k.name: _normalize_ec2(vars(k))})
2195
120
         for k in self.api.get_all_key_pairs()]
2196
121
        return kps
2197
122
2198
123
2199
124
    def get_instances(self):
2200
125
        insts = {}
2201
126
        for reservation in self.api.get_all_instances():
2202
127
            [insts.update({i.id: _normalize_ec2(vars(i))})
2203
128
             for i in reservation.instances]
2204
129
        return insts
2205
130
2206
131
2207
132
    def get_floating_ips(self):
2208
133
        ips = {}
2209
134
        [ips.update({ip.public_ip:  _normalize_ec2(vars(ip))})
2210
135
         for ip in self.api.get_all_addresses()]
2211
136
        return ips
2212
137
2213
138
2214
139
    def get_volumes(self):
2215
140
        vols = {}
2216
141
        [vols.update({v.id: _normalize_ec2(vars(v))})
2217
142
         for v in self.api.get_all_volumes()]
2218
143
        return vols
2219
144
2220
145
2221
146
    def create_key_pair_and_instance(self):
2222
147
        '''
2223
148
        create a key_pair, launch an instance with it, wait for it
2224
149
        to start
2225
150
        '''
2226
151
        kp_name = 'upgrade_key_pair_%s' % uuid.uuid1()
2227
152
        kp = self.api.create_key_pair(key_name=kp_name)
2228
153
        self.key_pairs.append(kp_name)
2229
154
2230
155
        imgs = self.api.get_all_images()
2231
156
        img_id = None
2232
157
        for img in imgs:
2233
158
            if img.id.startswith('ami-'):
2234
159
                img_id = img.id
2235
160
                break
2236
161
2237
162
        res = self.api.run_instances(img_id, key_name=kp_name,
2238
163
                                     instance_type='m1.tiny')
2239
164
        time.sleep(1)
2240
165
        instance_id = res.instances[0].id
2241
166
        self.instances.append(instance_id)
2242
167
2243
168
        timeout = 0
2244
169
2245
170
        while instance_id not in self.instances_running([instance_id]):
2246
171
            time.sleep(1)
2247
172
            timeout += 1
2248
173
            if timeout >= INST_RUN_TIMEOUT:
2249
174
                logging.error('Timed out waiting for instance to run: %s' %\
2250
175
                               instance_id)
2251
176
                raise Exception
2252
177
        logging.info('Instance running: %s' % instance_id)
2253
178
2254
179
2255
180
    def create_and_associate_floating_ip(self):
2256
181
        instance_id = self.instance_ids().pop()
2257
182
        address = self.api.allocate_address()
2258
183
        self.floating_ips.append(address.public_ip)
2259
184
        self.api.associate_address(instance_id, public_ip=address.public_ip)
2260
185
2261
186
2262
187
    def create_and_attach_volume(self):
2263
188
        instance_id = self.instance_ids().pop()
2264
189
        volume = self.api.create_volume(size=1, zone='nova')
2265
190
        self.volumes.append(volume.id)
2266
191
        time.sleep(1)
2267
192
        timeout = 0
2268
193
        while timeout <= VOL_CREATE_TIMEOUT:
2269
194
            vol = self.api.get_all_volumes(volume_ids=[volume.id])
2270
195
            if vol and vol[0].status == 'available':
2271
196
                break
2272
197
            timeout += 1
2273
198
            time.sleep(1)
2274
199
        print 'created vol: %s' %volume.id
2275
200
2276
201
        self.api.attach_volume(volume_id=volume.id, instance_id=instance_id,
2277
202
                               device='/dev/vdb')
2278
203
        timeout = 0
2279
204
        while timeout <= VOL_ATTACH_TIMEOUT:
2280
205
            vol = self.api.get_all_volumes(volume_ids=[volume.id])
2281
206
            if vol and vol[0].status == 'in-use':
2282
207
                break
2283
208
            timeout += 1
2284
209
            time.sleep(1)
2285
210
2286
211
2287
212
    def teardown(self):
2288
213
        self.api.terminate_instances(self.instances)
2289
214
        timeout = 0
2290
215
        while self.instances_running(self.instances):
2291
216
            if timeout >= INST_TERMINATE_TIMEOUT:
2292
217
                logging.error('Timeout waiting for instances terminate: %s' %\
2293
218
                              self.instances)
2294
219
                raise Exception
2295
220
            timeout += 1
2296
221
            time.sleep(1)
2297
222
        [self.api.delete_key_pair(k) for k in self.key_pairs]
2298
223
        [self.api.release_address(ip)
2299
224
         for ip in self.floating_ips]
2300
225
        [self.api.delete_volume(vol) for vol in self.volumes]
2301
226
2302
227
2303
228
class OSAPICloudClient(object):
2304
229
    def __init__(self, username, password, tenant_name, auth_url):
2305
230
        self.compute_api = OSNovaClient(username, password,
2306
231
                                        tenant_name, auth_url, no_cache=True)
2307
232
        self.volume_api = OSCinderClient(username, password,
2308
233
                                         tenant_name, auth_url)
2309
234
        # track IDs of created resources for tear-down.
2310
235
        self.instances = []
2311
236
        self.key_pairs = []
2312
237
        self.floating_ips =[]
2313
238
        self.volumes = []
2314
239
2315
240
    def instance_ids(self):
2316
241
        return [inst.id for inst in self.compute_api.servers.list()]
2317
242
2318
243
    def instances_running(self, instance_ids=[]):
2319
244
        '''given a list of instance_ids, return list of only running instances'''
2320
245
        running = []
2321
246
        for id in instance_ids:
2322
247
            if id in [i.id for i in self.compute_api.servers.list()]:
2323
248
                running.append(id)
2324
249
2325
250
        for id in running:
2326
251
            inst = self.compute_api.servers.get(id)
2327
252
            if inst.status != 'ACTIVE':
2328
253
                running.remove(id)
2329
254
        return running
2330
255
2331
256
    def get_images(self):
2332
257
        images = {}
2333
258
        [images.update({i.id: _normalize_osapi(vars(i))})
2334
259
         for i in self.compute_api.images.list()]
2335
260
        return images
2336
261
2337
262
    def get_key_pairs(self):
2338
263
        kps  = {}
2339
264
        [kps.update({k.id: _normalize_osapi(vars(k))})
2340
265
         for k in self.compute_api.keypairs.list()]
2341
266
        return kps
2342
267
2343
268
    def get_instances(self):
2344
269
        insts = {}
2345
270
        [insts.update({i.id: _normalize_osapi(vars(i))})
2346
271
         for i in self.compute_api.servers.list()]
2347
272
        return insts
2348
273
2349
274
    def get_floating_ips(self):
2350
275
        ips = {}
2351
276
        [ips.update({i.id: _normalize_osapi(vars(i))})
2352
277
         for i in self.compute_api.floating_ips.list()]
2353
278
        return ips
2354
279
2355
280
2356
281
    def get_volumes(self):
2357
282
        vols = {}
2358
283
        [vols.update({v.id: _normalize_osapi(vars(v))})
2359
284
         for v in self.volume_api.volumes.list()]
2360
285
        return vols
2361
286
2362
287
2363
288
    def create_key_pair_and_instance(self):
2364
289
        kp_name = 'upgrade_key_pair_%s' % uuid.uuid1()
2365
290
        inst_name = 'upgrade_instance_%s' % uuid.uuid1()
2366
291
        image_id = self.get_images().keys().pop()
2367
292
        kp = self.compute_api.keypairs.create(name=kp_name)
2368
293
        instance = self.compute_api.servers.create(name=inst_name, flavor=1,
2369
294
                                                   image=image_id,
2370
295
                                                   key_name=kp_name)
2371
296
        timeout = 0
2372
297
        while self.compute_api.servers.get(instance.id).status != 'ACTIVE':
2373
298
            if timeout >= INST_RUN_TIMEOUT:
2374
299
                logging.error('Timed out waiting for instance to run: %s' %\
2375
300
                               instance.name)
2376
301
                raise Exception
2377
302
            timeout += 1
2378
303
            time.sleep(1)
2379
304
2380
305
        self.instances.append(instance.id)
2381
306
        self.key_pairs.append(kp_name)
2382
307
2383
308
2384
309
    def create_and_associate_floating_ip(self):
2385
310
        instance = self.compute_api.servers.list().pop()
2386
311
        floating_ip = self.compute_api.floating_ips.create()
2387
312
        self.floating_ips.append(floating_ip.ip)
2388
313
        instance.add_floating_ip(floating_ip.ip)
2389
314
2390
315
2391
316
    def create_and_attach_volume(self):
2392
317
        instance = self.compute_api.servers.list().pop()
2393
318
        volume = self.volume_api.volumes.create(size=1)
2394
319
        self.volumes.append(volume.id)
2395
320
        # TODO volume attach requires cinder.
2396
321
2397
322
2398
323
    def teardown(self):
2399
324
        for instance in self.instances:
2400
325
            self.compute_api.servers.delete(instance)
2401
326
2402
327
        timeout = 0
2403
328
        while self.instances_running(self.instances):
2404
329
            if timeout >= INST_TERMINATE_TIMEOUT:
2405
330
                logging.error('Timeout waiting for instances terminate: %s' %\
2406
331
                              self.instances)
2407
332
                raise Exception
2408
333
            timeout += 1
2409
334
            time.sleep(1)
2410
335
        [self.compute_api.keypairs.delete(kp)
2411
336
         for kp in self.key_pairs]
2412
337
        [self.volume_api.volumes.delete(v)
2413
338
         for v in self.volumes]
2414
339
2415
340
2416
341
def create_snapshot(client):
2417
342
    snapshot = {}
2418
343
    for collection in ['images', 'key_pairs', 'instances', 'floating_ips',
2419
344
                       'volumes']:
2420
345
        f = 'get_%s' % collection
2421
346
        if not hasattr(client, f):
2422
347
            logging.warning('CloudClient (%s) does not implement %s' %\
2423
348
                            (client, f))
2424
349
        f = getattr(client, f)
2425
350
        snapshot[collection] = f()
2426
351
    return snapshot
2427
352
0
2428
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/config.py'
2429
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/config.py	2014-06-10 23:44:37 +0000
2430
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/config.py	1970-01-01 00:00:00 +0000
2431
@@ -1,46 +0,0 @@
2432
1
2433
2
import ConfigParser
2434
3
2435
4
DEFAULT_CONFIG = 'etc/openstack.conf'
2436
5
2437
6
2438
7
class CloudConfig(object):
2439
8
    def __init__(self, conf=None):
2440
9
        if not conf:
2441
10
            conf = DEFAULT_CONFIG
2442
11
        self.config = ConfigParser.SafeConfigParser()
2443
12
        self.config.read(conf)
2444
13
2445
14
    def get(self, section=None, item=None):
2446
15
        if not section:
2447
16
            section = 'DEFAULT'
2448
17
        return self.config.get(section, item)
2449
18
2450
19
    def enabled_services(self):
2451
20
        '''translate ENABLED_SERVICES to corresponding juju OS service names.
2452
21
        '''
2453
22
        service_map = {
2454
23
            'n-api': 'nova-cloud-controller',
2455
24
            'n-crt': 'nova-cloud-controller',
2456
25
            'n-obj': 'nova-cloud-controller',
2457
26
            'n-sch': 'nova-cloud-controller',
2458
27
            'g-api': 'glance',
2459
28
            'g-reg': 'glance',
2460
29
            'key': 'keystone',
2461
30
            'cinder': 'cinder',
2462
31
            'c-api': 'cinder',
2463
32
            'c-vol': 'cinder',
2464
33
            'horizon': 'openstack-dashboard',
2465
34
            'n-net': 'nova-compute',
2466
35
            'quantum': 'quantum'
2467
36
        }
2468
37
        env = self.get('DEFAULT', 'enabled_services').split(',')
2469
38
        enabled_services = []
2470
39
        for svc in env:
2471
40
            try:
2472
41
                service = service_map[svc]
2473
42
                if service not in enabled_services:
2474
43
                    enabled_services.append(service)
2475
44
            except KeyError:
2476
45
                pass
2477
46
        return enabled_services
2478
47
0
2479
=== removed directory 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/juju'
2480
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/juju/__init__.py'
2481
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/juju/client.py'
2482
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/juju/client.py	2014-06-10 23:44:37 +0000
2483
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/juju/client.py	1970-01-01 00:00:00 +0000
2484
@@ -1,190 +0,0 @@
2485
1
# Some simple helpers to wrap the juju client, mostly borrowed
2486
2
# from Kapil's charmrunner: lp:~hazmat/+junk/charmrunner
2487
3
2488
4
import json
2489
5
import subprocess
2490
6
import logging
2491
7
import time
2492
8
import yaml
2493
9
2494
10
2495
11
class JujuTestClientException(Exception):
2496
12
    pass
2497
13
2498
14
2499
15
def call(juju_cmd, environment=None):
2500
16
    cmd = ['juju']
2501
17
    if environment:
2502
18
        cmd += ['-e', environment]
2503
19
    cmd += juju_cmd
2504
20
    logging.debug('Calling: %s' % ' '.join(cmd))
2505
21
    print 'juju client: %s' % cmd
2506
22
    subprocess.check_output(cmd)
2507
23
2508
24
2509
25
def destroy_environment(sudo=False):
2510
26
    logging.debug('Destroying environment.')
2511
27
    cmd = ['juju', 'destroy-environment', '-y']
2512
28
    if sudo:
2513
29
        cmd = ['sudo'] + cmd
2514
30
    p = subprocess.Popen(cmd,
2515
31
                         stdout=subprocess.PIPE, stdin=subprocess.PIPE,
2516
32
                         stderr=subprocess.PIPE)
2517
33
    print p.communicate(input='y\n')[0]
2518
34
2519
35
2520
36
def status(environment=None, with_stderr=False, timeout=None):
2521
37
    """Get a status dictionary.
2522
38
    """
2523
39
    args = ["juju", "status", "--format=json"]
2524
40
2525
41
    if timeout:
2526
42
        args = ['timeout', str(timeout)] + args
2527
43
2528
44
    if environment:
2529
45
        args += ['-e', environment]
2530
46
2531
47
    if with_stderr:
2532
48
        output = subprocess.check_output(args, stderr=subprocess.STDOUT)
2533
49
        return output
2534
50
    else:
2535
51
        output = subprocess.check_output(args, stderr=open("/dev/null"))
2536
52
        return json.loads(output)
2537
53
2538
54
2539
55
def is_bootstrapped(environment=None, timeout=None):
2540
56
    try:
2541
57
        _status = status(environment=environment, with_stderr=False,
2542
58
                         timeout=timeout)
2543
59
    except:
2544
60
        return False
2545
61
2546
62
    try:
2547
63
        return _status['machines']['0']['agent-state'] == 'started'
2548
64
    except KeyError:
2549
65
        return False
2550
66
2551
67
2552
68
def deploy(repo_dir, charm, environment=None, service=None, config=None,
2553
69
           args=[]):
2554
70
    '''
2555
71
    Deploy a charm as a service.
2556
72
    '''
2557
73
    cmd = ["juju", "deploy",
2558
74
           "--repository", repo_dir]
2559
75
    if config:
2560
76
        cmd += ['--config=%s' % config]
2561
77
    if environment:
2562
78
        cmd += ['-e', environment]
2563
79
    [cmd.append(a) for a in args]
2564
80
    cmd += ["local:%s" % charm]
2565
81
    if service:
2566
82
        cmd += [service]
2567
83
    output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
2568
84
    logging.info("Deployed %s" % (service or charm))
2569
85
    return output
2570
86
2571
87
2572
88
def get_config(service):
2573
89
    args = ['juju', 'get', service]
2574
90
    output = subprocess.check_output(args, stderr=open('/dev/null'))
2575
91
    return yaml.load(output)
2576
92
2577
93
2578
94
def services(environment=None):
2579
95
    '''yield (name, address, state) for every service deployed.  this assumes
2580
96
       a single machine unit per service'''
2581
97
    _status = status(environment)
2582
98
    for service, info in _status['services'].iteritems():
2583
99
        unit = info['units'].keys()[0]
2584
100
        m_id = str(info['units'][unit]['machine'])
2585
101
        try:
2586
102
            dns_name = _status['machines'][m_id]['dns-name']
2587
103
        except KeyError:
2588
104
            dns_name = None
2589
105
        state = info['units'][unit]['agent-state']
2590
106
        yield (service, dns_name, state)
2591
107
2592
108
2593
109
def get_machine_unit(service_name, environment=None):
2594
110
    for service, address, state in services(environment):
2595
111
        if service == service_name:
2596
112
            return address
2597
113
2598
114
2599
115
def instance_ids():
2600
116
    _status = status()
2601
117
    return [_status['machines'][n]['instance-id'] for n in _status['machines']]
2602
118
2603
119
2604
120
def ensure_bootstrap(environment=None, constraints=None, timeout=180,
2605
121
                     sudo=False):
2606
122
    '''
2607
123
    Bootstrap and wait for a started environment within timeout specified.
2608
124
    Bootstrapping may require sudo access (ie, local provider)
2609
125
    '''
2610
126
2611
127
    if is_bootstrapped(environment, timeout=5):
2612
128
        logging.info('Environment Already bootstrapped.')
2613
129
        return True
2614
130
2615
131
    cmd = ['juju', 'bootstrap']
2616
132
    if environment:
2617
133
        cmd += ['-e', environment]
2618
134
    if constraints:
2619
135
        cmd += ['--constraints', constraints]
2620
136
2621
137
    if sudo:
2622
138
        cmd = ['sudo'] + cmd
2623
139
2624
140
    logging.info('Boostrapping new environment')
2625
141
    try:
2626
142
        subprocess.check_output(cmd)
2627
143
    except:
2628
144
        logging.error('Calling "juju bootstrap" failed!')
2629
145
2630
146
    i = 0
2631
147
    while not is_bootstrapped(environment, timeout=5):
2632
148
        if i >= timeout:
2633
149
            logging.error('Juju bootstrap timeout.')
2634
150
            raise JujuTestClientException
2635
151
        time.sleep(1)
2636
152
        i += 1
2637
153
2638
154
    return True
2639
155
2640
156
2641
157
def wait_for_state(service, state, environment=None, timeout=180):
2642
158
    logging.debug('Waiting for service %s to reach state %s.' %
2643
159
                  (service, state))
2644
160
    i = 0
2645
161
    while True:
2646
162
        _status = status(environment)
2647
163
        if service not in _status['services']:
2648
164
            logging.error('wait_for_state: Could not find service ' + service)
2649
165
            raise JujuTestClientException
2650
166
        _st = list(set([_status['services'][service]['units'][u]['agent-state']
2651
167
                   for u in _status['services'][service]['units']]))
2652
168
        if 'error' in _st:
2653
169
            logging.error('Unit error while waiting for %s to reach state %.'
2654
170
                          % (service, state))
2655
171
            raise JujuTestClientException
2656
172
        if _st == [state]:
2657
173
            return True
2658
174
        if i >= timeout:
2659
175
            logging.error('Timeout waiting for service %s to reach state: %s' %
2660
176
                          (service, state))
2661
177
            raise JujuTestClientException
2662
178
        time.sleep(1)
2663
179
        i += 1
2664
180
2665
181
2666
182
def service_machine_units(service, environment=None):
2667
183
    _status = status()
2668
184
    try:
2669
185
        _service = _status['services'][service]
2670
186
    except KeyError:
2671
187
        logging.error('Could not find machine units for unknown service %s' %
2672
188
                      service)
2673
189
        raise JujuTestClientException
2674
190
    return [_service['units'][u]['machine'] for u in _service['units']]
2675
191
0
2676
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/juju/juju_deployer.py'
2677
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/juju/juju_deployer.py	2014-06-10 23:44:37 +0000
2678
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/juju/juju_deployer.py	1970-01-01 00:00:00 +0000
2679
@@ -1,186 +0,0 @@
2680
1
import logging
2681
2
import os
2682
3
import paramiko
2683
4
import shutil
2684
5
import time
2685
6
import yaml
2686
7
2687
8
from deployer.config import ConfigStack
2688
9
from deployer.action import importer
2689
10
from deployer.env import select_runtime
2690
11
from deployer.utils import setup_logging
2691
12
2692
13
# SSH user for collecting log artifacts
2693
14
REMOTE_USER = 'ubuntu'
2694
15
2695
16
# SSH Command to use for collecting artifacts on every node
2696
17
REMOTE_LOG_CMD = "sudo tar -czf /tmp/%s-%s-artifacts.tar.gz /etc /var/log"
2697
18
2698
19
2699
20
class Config(object):
2700
21
    # what juju-deployer would typically take as argparse
2701
22
    no_local_mods = False
2702
23
    update_charms = False
2703
24
    overrides = None
2704
25
    branch_only = False
2705
26
    timeout = 1800
2706
27
    watch = True
2707
28
    verbose = True
2708
29
    debug = True
2709
30
    rel_wait = 240
2710
31
    bootstrap = True
2711
32
    retry_count = None
2712
33
    deploy_delay = 0
2713
34
2714
35
2715
36
def run_deployer(environment, configs, deployment, **kwargs):
2716
37
    '''
2717
38
    Uses juju-deployer to deploy a deployment from a given config(s)
2718
39
    into an already deployed environment.
2719
40
2720
41
    Example usage:
2721
42
        run_deployer(
2722
43
            environment='precise',
2723
44
            configs=['/tmp/base.cfg'],
2724
45
            deployment='precise-grizzly',
2725
46
            debug=True, verbose=True
2726
47
        )
2727
48
    '''
2728
49
    opts = Config()
2729
50
2730
51
    setup_logging(
2731
52
        verbose=kwargs.get('verbose', False),
2732
53
        debug=kwargs.get('debug', False),
2733
54
    )
2734
55
2735
56
    if 'overrides' in kwargs:
2736
57
        opts.overrides = kwargs['overrides']
2737
58
2738
59
    for conf in configs:
2739
60
        if not os.path.isfile(conf):
2740
61
            e = 'Could not find deployment config @ %s.' % conf
2741
62
            raise Exception(e)
2742
63
2743
64
    env = select_runtime(environment, opts)
2744
65
    config = ConfigStack(configs)
2745
66
    deploy = config.get(deployment)
2746
67
    importer.Importer(env, deploy, options=opts).run()
2747
68
2748
69
2749
70
def reset(environment):
2750
71
    env = select_runtime(environment, Config())
2751
72
    env.connect()
2752
73
    env.reset(terminate_machines=True, terminate_delay=6, watch=True,
2753
74
              timeout=600)
2754
75
2755
76
2756
77
def locate_machine(status, machine_id):
2757
78
    '''determine service unit assigned to machine id'''
2758
79
    if machine_id == '0':
2759
80
        return 'bootstrap-machine-0'
2760
81
    services = status['services']
2761
82
    for unit in [services[k]['units'] for k in services.iterkeys()]:
2762
83
        if machine_id in [u['machine'] for u in unit.itervalues()]:
2763
84
            return [k for k in unit.iterkeys()][0].replace('/', '-')
2764
85
    return None
2765
86
2766
87
2767
88
def hosts_services(status):
2768
89
    machines = []
2769
90
    for id, machine in status['machines'].iteritems():
2770
91
        if 'dns-name' not in machine:
2771
92
            logging.error('Machine %s has no dns-name.' % id)
2772
93
            logging.error(machine)
2773
94
            continue
2774
95
        m = {'id': id, 'dns-name': machine['dns-name']}
2775
96
        machines.append(m)
2776
97
    [m.update({'service': locate_machine(status, m['id'])})
2777
98
     for m in machines]
2778
99
    return machines
2779
100
2780
101
2781
102
def collect_artifacts(environment, outdir):
2782
103
    if not os.path.exists(outdir):
2783
104
        os.makedirs(outdir)
2784
105
    if not os.path.isdir(outdir):
2785
106
        raise Exception('%s exists but is not a directory.' % outdir)
2786
107
2787
108
    env = select_runtime(environment, Config())
2788
109
2789
110
    conns = {}
2790
111
    hosts = hosts_services(env.get_cli_status())
2791
112
2792
113
    logging.info('Collecting artifacts from %s.' %
2793
114
                 [h['dns-name'] for h in hosts])
2794
115
2795
116
    for host in hosts:
2796
117
        hn = host['dns-name']
2797
118
2798
119
        conns[hn] = {}
2799
120
        conns[hn]['ssh'] = paramiko.SSHClient()
2800
121
        conns[hn]['ssh'].set_missing_host_key_policy(paramiko.AutoAddPolicy())
2801
122
2802
123
        try:
2803
124
            conns[hn]['ssh'].connect(hn, username=REMOTE_USER)
2804
125
            conns[hn]['sftp'] = conns[hn]['ssh'].open_sftp()
2805
126
        except Exception as e:
2806
127
            raise Exception('Could not setup ssh connection to %s: %s' %
2807
128
                            (hn, e))
2808
129
2809
130
    for host in hosts:
2810
131
        hn = host['dns-name']
2811
132
        svc = host['service']
2812
133
        cmd = REMOTE_LOG_CMD % (svc, hn)
2813
134
        try:
2814
135
            conns[hn]['ssh'].exec_command(cmd)
2815
136
        except Exception as e:
2816
137
            logging.error('Could not execute remote log cmd on '
2817
138
                          'host %s: %s' % (hn, cmd))
2818
139
            raise e
2819
140
2820
141
    # sleep for 5, allow all hosts to finish tarring.
2821
142
    time.sleep(5)
2822
143
2823
144
    for host in hosts:
2824
145
        hn = host['dns-name']
2825
146
        svc = host['service']
2826
147
        try:
2827
148
            tgz = '%s-%s-artifacts.tar.gz' % (svc, hn)
2828
149
            conns[hn]['sftp'].get(
2829
150
                os.path.join('/tmp', tgz), os.path.join(outdir, tgz))
2830
151
        except Exception as e:
2831
152
            logging.error('Could not collect artifacts from %s:%s' %
2832
153
                          (hn, tgz))
2833
154
            raise e
2834
155
2835
156
    # collect the local maas logs if they exist
2836
157
    if os.path.isdir('/var/log/maas'):
2837
158
        for log in ['maas.log', 'pserv.log']:
2838
159
            l = os.path.join('/var/log/maas', log)
2839
160
            if os.path.isfile(l):
2840
161
                shutil.copy(l, outdir)
2841
162
2842
163
    # dump current juju status
2843
164
    with open(os.path.join(outdir, 'juju_status.yaml'), 'w') as out:
2844
165
        out.write(yaml.dump(env.get_cli_status()))
2845
166
2846
167
2847
168
class DeployerTest(object):
2848
169
    def __init__(self):
2849
170
        self.config = None
2850
171
2851
172
    def deploy(self, env=None):
2852
173
        env = env or self.config.get('ubuntu_release')
2853
174
        run_deployer(environment=env,
2854
175
                     configs=[self.config.get('deployment_config')],
2855
176
                     deployment=self.config.get('deployment'),
2856
177
                     overrides=self.config.get('overrides'),
2857
178
                     debug=True, verbose=True)
2858
179
2859
180
    def reset_environment(self, env=None):
2860
181
        _env = env or self.config.get('ubuntu_release')
2861
182
        reset(_env)
2862
183
2863
184
    def collect_artifacts(self, env, outdir):
2864
185
        _env = env or self.config.get('ubuntu_release')
2865
186
        collect_artifacts(_env, outdir)
2866
187
0
2867
=== removed directory 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master'
2868
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/all_variables'
2869
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/all_variables	2014-06-10 23:44:37 +0000
2870
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/all_variables	1970-01-01 00:00:00 +0000
2871
@@ -1,31 +0,0 @@
2872
1
# List of all place holders used in any of the test configs.
2873
2
# 'run_tests.py --configure' will reference this, and update
2874
3
# configs according to what is available in environment.
2875
4
# Putting this here and into run_tests.py keeps the Jenkins
2876
5
# jobs slim and clean.
2877
6
2878
7
# openstack.conf
2879
8
NOVA_HOST
2880
9
GLANCE_HOST
2881
10
KEYSTONE_HOST
2882
11
CINDER_HOST
2883
12
QUANTUM_HOST
2884
13
NOVA_COMPUTE_HOST
2885
14
NOVA_VOLUME_HOST
2886
15
ADMIN_TOKEN
2887
16
IMAGE_UUID
2888
17
IMAGE_NAME
2889
18
EC2_ACCESS_KEY
2890
19
EC2_SECRET_KEY
2891
20
EC2_URL
2892
21
S3_URL
2893
22
EC2_AMI_ID
2894
23
OS_USERNAME
2895
24
OS_PASSWORD
2896
25
OS_AUTH_URL
2897
26
OS_TENANT_NAME
2898
27
HORIZON_HOST
2899
28
ENABLED_SERVICES
2900
29
2901
30
# devstack.conf
2902
31
ENABLED_SERVICES
2903
32
0
2904
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack.conf'
2905
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack.conf	2014-06-10 23:44:37 +0000
2906
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack.conf	1970-01-01 00:00:00 +0000
2907
@@ -1,11 +0,0 @@
2908
1
[DEFAULT]
2909
2
templates=etc/devstack_templates/
2910
3
devstack_repo=https://github.com/openstack-dev/devstack.git
2911
4
devstack_branch=stable/havana
2912
5
enabled_services=%ENABLED_SERVICES%
2913
6
active_timeout=60
2914
7
associate_timeout=60
2915
8
boot_timeout=60
2916
9
running_timeout=120
2917
10
terminate_timeout=60
2918
11
secondary_ip_pool=test_range
2919
12
0
2920
=== removed directory 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates'
2921
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/exerciserc'
2922
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/exerciserc	2014-06-10 23:44:37 +0000
2923
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/exerciserc	1970-01-01 00:00:00 +0000
2924
@@ -1,32 +0,0 @@
2925
1
#!/usr/bin/env bash
2926
2
#
2927
3
# source exerciserc
2928
4
#
2929
5
# Configure the DevStack exercise scripts
2930
6
# For best results, source this _after_ stackrc/localrc as it will set
2931
7
# values only if they are not already set.
2932
8
2933
9
# Max time to wait while vm goes from build to active state
2934
10
export ACTIVE_TIMEOUT={{ active_timeout }}
2935
11
# Max time to wait for proper IP association and dis-association.
2936
12
export ASSOCIATE_TIMEOUT={{ associate_timeout }}
2937
13
2938
14
# Max time till the vm is bootable
2939
15
export BOOT_TIMEOUT={{ boot_timeout }}
2940
16
2941
17
# Max time from run instance command until it is running
2942
18
export RUNNING_TIMEOUT={{ running_timeout }}
2943
19
2944
20
# Max time to wait for a vm to terminate
2945
21
export TERMINATE_TIMEOUT={{ terminate_timeout }}
2946
22
2947
23
# Max time to wait for a euca-volume command to propogate
2948
24
export VOLUME_TIMEOUT=${VOLUME_TIMEOUT:-30}
2949
25
2950
26
# Max time to wait for a euca-delete command to propogate
2951
27
export VOLUME_DELETE_TIMEOUT=${SNAPSHOT_DELETE_TIMEOUT:-60}
2952
28
2953
29
# The size of the volume we want to boot from; some storage back-ends
2954
30
# do not allow a disk resize, so it's important that this can be tuned
2955
31
export DEFAULT_VOLUME_SIZE=${DEFAULT_VOLUME_SIZE:-1}
2956
32
2957
33
0
2958
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.master'
2959
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.master	2014-06-10 23:44:37 +0000
2960
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.master	1970-01-01 00:00:00 +0000
2961
@@ -1,110 +0,0 @@
2962
1
2963
2
###########################
2964
3
# Ubuntu CI Lab Settings
2965
4
###########################
2966
5
2967
6
# List of all enabled services, compiled by inspect_environment.sh
2968
7
# and set in etc/tests/devstack.conf
2969
8
ENABLED_SERVICES={{ enabled_services }}
2970
9
2971
10
# volumes + floating_ips test checks this when determining whether
2972
11
# or not it should try to ping internal IPs
2973
12
MULTI_HOST=1
2974
13
2975
14
# The second pool of floating ips, created during jenkins
2976
15
# via /var/lib/jenkins/tools/jenkins-scripts/prepare_cloud.sh
2977
16
TEST_FLOATING_POOL={{ secondary_ip_pool }}
2978
17
2979
18
# Should point to keystone
2980
19
HOST_IP={{ keystone_host }}
2981
20
SERVICE_HOST=${SERVICE_HOST:-$HOST_IP}
2982
21
2983
22
# Needed because tests use glance client directly
2984
23
GLANCE_HOST={{ glance_host }}
2985
24
2986
25
PRIVATE_NETWORK_NAME="private network"
2987
26
2988
27
# These get created by the Keystone charm during deployment.
2989
28
# They are set as config options to the charm
2990
29
export NOVA_PROJECT_ID={{ os_tenant_name }}
2991
30
export NOVA_USERNAME={{ os_username }}
2992
31
export NOVA_PASSWORD={{ os_password }}
2993
32
2994
33
# Commit 10670d1bad6b4afd3dce9af61d22c8cd5eeded59 changed keystone token
2995
34
# auth so that they use OS_ env. variables, but doesn't translate
2996
35
# properly from existing NOVA_ ones
2997
36
export OS_TENANT_NAME=$NOVA_PROJECT_ID
2998
37
export OS_USERNAME=$NOVA_USERNAME
2999
38
export OS_PASSWORD=$NOVA_PASSWORD
3000
39
export OS_AUTH_URL="http://$HOST_IP:5000/v2.0/"
3001
40
3002
41
# Set the ec2 url so euca2ools works
3003
42
export EC2_URL="http://{{ nova_host }}:8773/services/Cloud"
3004
43
3005
44
# Also set s3 url for bundle testing
3006
45
export S3_URL="http://{{ nova_host }}:3333"
3007
46
3008
47
# Specify what image to parse out of 'glance index' so we don't accidentally
3009
48
# try spawning the test, null AMI that the bundle test publishses.
3010
49
# DISABLED: setting this actually throws off devstack's regexp 
3011
50
# and the test sometimes boots an AKI instead of AMI. 
3012
51
#export DEFAULT_IMAGE_NAME="cirros-0.3.0-x86_64-uec-ami"
3013
52
3014
53
# Bumped these timeouts to 60, bump higher if we decide to use
3015
54
# cloud images instead of ttylinux
3016
55
# Max time till the vm is bootable
3017
56
export BOOT_TIMEOUT=60
3018
57
# Max time to wait while vm goes from build to active state
3019
58
export ACTIVE_TIMEOUT=60
3020
59
3021
60
# Timeout for instance termination
3022
61
export TERMINATE_TIMEOUT=30
3023
62
3024
63
# Disable use of python-keyring during tests.
3025
64
export OS_NO_CACHE=1
3026
65
3027
66
###########################
3028
67
# Devstack defaults
3029
68
###########################
3030
69
3031
70
# With the addition of Keystone, to use an openstack cloud you should
3032
71
# authenticate against keystone, which returns a **Token** and **Service
3033
72
# Catalog**.  The catalog contains the endpoint for all services the user/tenant
3034
73
# has access to - including nova, glance, keystone, swift, ...  We currently
3035
74
# recommend using the 2.0 *auth api*.
3036
75
#
3037
76
# *NOTE*: Using the 2.0 *auth api* does not mean that compute api is 2.0.  We
3038
77
# will use the 1.1 *compute api*
3039
78
export NOVA_URL=${NOVA_URL:-http://$SERVICE_HOST:5000/v2.0/}
3040
79
3041
80
# Currently novaclient needs you to specify the *compute api* version.  This
3042
81
# needs to match the config of your catalog returned by Keystone.
3043
82
export NOVA_VERSION=${NOVA_VERSION:-1.1}
3044
83
3045
84
# FIXME - why does this need to be specified?
3046
85
export NOVA_REGION_NAME=${NOVA_REGION_NAME:-RegionOne}
3047
86
3048
87
# Euca2ools Certificate stuff for uploading bundles
3049
88
# You can get your certs using ./tools/get_certs.sh
3050
89
NOVARC=$(readlink -f "${BASH_SOURCE:-${0}}" 2>/dev/null) ||
3051
90
        NOVARC=$(python -c 'import os,sys; print os.path.abspath(os.path.realpath(sys.argv[1]))' "${BASH_SOURCE:-${0}}")
3052
91
NOVA_KEY_DIR=${NOVARC%/*}
3053
92
# Override this above, since devstack seems to use SERVICE_HOST to describe
3054
93
# both the nova host + keystone
3055
94
#export S3_URL=http://$SERVICE_HOST:3333
3056
95
export EC2_USER_ID=42 # nova does not use user id, but bundling requires it
3057
96
export EC2_PRIVATE_KEY=${NOVA_KEY_DIR}/pk.pem
3058
97
export EC2_CERT=${NOVA_KEY_DIR}/cert.pem
3059
98
export NOVA_CERT=${NOVA_KEY_DIR}/cacert.pem
3060
99
export EUCALYPTUS_CERT=${NOVA_CERT} # euca-bundle-image seems to require this set
3061
100
alias ec2-bundle-image="ec2-bundle-image --cert ${EC2_CERT} --privatekey ${EC2_PRIVATE_KEY} --user 42 --ec2cert ${NOVA_CERT}"
3062
101
alias ec2-upload-bundle="ec2-upload-bundle -a ${EC2_ACCESS_KEY} -s ${EC2_SECRET_KEY} --url ${S3_URL} --ec2cert ${NOVA_CERT}"
3063
102
3064
103
# set log level to DEBUG (helps debug issues)
3065
104
# export NOVACLIENT_DEBUG=1
3066
105
3067
106
# Max time from run instance command until it is running
3068
107
export RUNNING_TIMEOUT=${RUNNING_TIMEOUT:-$(($BOOT_TIMEOUT + $ACTIVE_TIMEOUT))}
3069
108
3070
109
# Max time to wait for proper IP association and dis-association.
3071
110
export ASSOCIATE_TIMEOUT=${ASSOCIATE_TIMEOUT:-15}
3072
111
0
3073
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.stable_essex'
3074
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.stable_essex	2014-06-10 23:44:37 +0000
3075
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.stable_essex	1970-01-01 00:00:00 +0000
3076
@@ -1,100 +0,0 @@
3077
1
3078
2
###########################
3079
3
# Ubuntu CI Lab Settings
3080
4
###########################
3081
5
# stable/essex
3082
6
# volumes + floating_ips test checks this when determining whether
3083
7
# or not it should try to ping internal IPs
3084
8
MULTI_HOST=1
3085
9
3086
10
# The second pool of floating ips, created during jenkins
3087
11
# via /var/lib/jenkins/tools/jenkins-scripts/prepare_cloud.sh
3088
12
TEST_FLOATING_POOL={{ secondary_ip_pool }}
3089
13
3090
14
# Should point to keystone
3091
15
HOST_IP={{ keystone_host }}
3092
16
SERVICE_HOST=${SERVICE_HOST:-$HOST_IP}
3093
17
3094
18
# Needed because tests use glance client directly
3095
19
GLANCE_HOST={{ glance_host }}
3096
20
3097
21
# These get created by the Keystone charm during deployment.
3098
22
# They are set as config options to the charm
3099
23
export NOVA_PROJECT_ID={{ os_tenant_name }}
3100
24
export NOVA_USERNAME={{ os_username }}
3101
25
export NOVA_PASSWORD={{ os_password }}
3102
26
3103
27
# Commit 10670d1bad6b4afd3dce9af61d22c8cd5eeded59 changed keystone token
3104
28
# auth so that they use OS_ env. variables, but doesn't translate
3105
29
# properly from existing NOVA_ ones
3106
30
export OS_TENANT_NAME=$NOVA_PROJECT_ID
3107
31
export OS_USERNAME=$NOVA_USERNAME
3108
32
export OS_PASSWORD=$NOVA_PASSWORD
3109
33
export OS_AUTH_URL="http://$HOST_IP:5000/v2.0/"
3110
34
3111
35
# Set the ec2 url so euca2ools works
3112
36
export EC2_URL="http://{{ nova_host }}:8773/services/Cloud"
3113
37
3114
38
# Also set s3 url for bundle testing
3115
39
export S3_URL="http://{{ nova_host }}:3333"
3116
40
3117
41
# Specify what image to parse out of 'glance index' so we don't accidentally
3118
42
# try spawning the test, null AMI that the bundle test publishses.
3119
43
# DISABLED: setting this actually throws off devstack's regexp 
3120
44
# and the test sometimes boots an AKI instead of AMI. 
3121
45
#export DEFAULT_IMAGE_NAME="cirros-0.3.0-x86_64-uec-ami"
3122
46
3123
47
# Bumped these timeouts to 60, bump higher if we decide to use
3124
48
# cloud images instead of ttylinux
3125
49
# Max time till the vm is bootable
3126
50
export BOOT_TIMEOUT=60
3127
51
# Max time to wait while vm goes from build to active state
3128
52
export ACTIVE_TIMEOUT=60
3129
53
3130
54
# Timeout for instance termination
3131
55
export TERMINATE_TIMEOUT=30
3132
56
###########################
3133
57
# Devstack defaults 
3134
58
###########################
3135
59
3136
60
# With the addition of Keystone, to use an openstack cloud you should
3137
61
# authenticate against keystone, which returns a **Token** and **Service
3138
62
# Catalog**.  The catalog contains the endpoint for all services the user/tenant
3139
63
# has access to - including nova, glance, keystone, swift, ...  We currently
3140
64
# recommend using the 2.0 *auth api*.
3141
65
#
3142
66
# *NOTE*: Using the 2.0 *auth api* does not mean that compute api is 2.0.  We
3143
67
# will use the 1.1 *compute api*
3144
68
export NOVA_URL=${NOVA_URL:-http://$SERVICE_HOST:5000/v2.0/}
3145
69
3146
70
# Currently novaclient needs you to specify the *compute api* version.  This
3147
71
# needs to match the config of your catalog returned by Keystone.
3148
72
export NOVA_VERSION=${NOVA_VERSION:-1.1}
3149
73
3150
74
# FIXME - why does this need to be specified?
3151
75
export NOVA_REGION_NAME=${NOVA_REGION_NAME:-RegionOne}
3152
76
3153
77
# Euca2ools Certificate stuff for uploading bundles
3154
78
# You can get your certs using ./tools/get_certs.sh
3155
79
NOVARC=$(readlink -f "${BASH_SOURCE:-${0}}" 2>/dev/null) ||
3156
80
        NOVARC=$(python -c 'import os,sys; print os.path.abspath(os.path.realpath(sys.argv[1]))' "${BASH_SOURCE:-${0}}")
3157
81
NOVA_KEY_DIR=${NOVARC%/*}
3158
82
# Override this above, since devstack seems to use SERVICE_HOST to describe
3159
83
# both the nova host + keystone
3160
84
#export S3_URL=http://$SERVICE_HOST:3333
3161
85
export EC2_USER_ID=42 # nova does not use user id, but bundling requires it
3162
86
export EC2_PRIVATE_KEY=${NOVA_KEY_DIR}/pk.pem
3163
87
export EC2_CERT=${NOVA_KEY_DIR}/cert.pem
3164
88
export NOVA_CERT=${NOVA_KEY_DIR}/cacert.pem
3165
89
export EUCALYPTUS_CERT=${NOVA_CERT} # euca-bundle-image seems to require this set
3166
90
alias ec2-bundle-image="ec2-bundle-image --cert ${EC2_CERT} --privatekey ${EC2_PRIVATE_KEY} --user 42 --ec2cert ${NOVA_CERT}"
3167
91
alias ec2-upload-bundle="ec2-upload-bundle -a ${EC2_ACCESS_KEY} -s ${EC2_SECRET_KEY} --url ${S3_URL} --ec2cert ${NOVA_CERT}"
3168
92
3169
93
# set log level to DEBUG (helps debug issues)
3170
94
# export NOVACLIENT_DEBUG=1
3171
95
3172
96
# Max time from run instance command until it is running
3173
97
export RUNNING_TIMEOUT=${RUNNING_TIMEOUT:-$(($BOOT_TIMEOUT + $ACTIVE_TIMEOUT))}
3174
98
3175
99
# Max time to wait for proper IP association and dis-association.
3176
100
export ASSOCIATE_TIMEOUT=${ASSOCIATE_TIMEOUT:-15}
3177
101
0
3178
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.stable_folsom'
3179
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.stable_folsom	2014-06-10 23:44:37 +0000
3180
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.stable_folsom	1970-01-01 00:00:00 +0000
3181
@@ -1,110 +0,0 @@
3182
1
3183
2
###########################
3184
3
# Ubuntu CI Lab Settings
3185
4
###########################
3186
5
3187
6
# List of all enabled services, compiled by inspect_environment.sh
3188
7
# and set in etc/tests/devstack.conf
3189
8
ENABLED_SERVICES={{ enabled_services }}
3190
9
3191
10
# volumes + floating_ips test checks this when determining whether
3192
11
# or not it should try to ping internal IPs
3193
12
MULTI_HOST=1
3194
13
3195
14
# The second pool of floating ips, created during jenkins
3196
15
# via /var/lib/jenkins/tools/jenkins-scripts/prepare_cloud.sh
3197
16
TEST_FLOATING_POOL={{ secondary_ip_pool }}
3198
17
3199
18
# Should point to keystone
3200
19
HOST_IP={{ keystone_host }}
3201
20
SERVICE_HOST=${SERVICE_HOST:-$HOST_IP}
3202
21
3203
22
# Needed because tests use glance client directly
3204
23
GLANCE_HOST={{ glance_host }}
3205
24
3206
25
PRIVATE_NETWORK_NAME="private network"
3207
26
3208
27
# These get created by the Keystone charm during deployment.
3209
28
# They are set as config options to the charm
3210
29
export NOVA_PROJECT_ID={{ os_tenant_name }}
3211
30
export NOVA_USERNAME={{ os_username }}
3212
31
export NOVA_PASSWORD={{ os_password }}
3213
32
3214
33
# Commit 10670d1bad6b4afd3dce9af61d22c8cd5eeded59 changed keystone token
3215
34
# auth so that they use OS_ env. variables, but doesn't translate
3216
35
# properly from existing NOVA_ ones
3217
36
export OS_TENANT_NAME=$NOVA_PROJECT_ID
3218
37
export OS_USERNAME=$NOVA_USERNAME
3219
38
export OS_PASSWORD=$NOVA_PASSWORD
3220
39
export OS_AUTH_URL="http://$HOST_IP:5000/v2.0/"
3221
40
3222
41
# Set the ec2 url so euca2ools works
3223
42
export EC2_URL="http://{{ nova_host }}:8773/services/Cloud"
3224
43
3225
44
# Also set s3 url for bundle testing
3226
45
export S3_URL="http://{{ nova_host }}:3333"
3227
46
3228
47
# Specify what image to parse out of 'glance index' so we don't accidentally
3229
48
# try spawning the test, null AMI that the bundle test publishses.
3230
49
# DISABLED: setting this actually throws off devstack's regexp 
3231
50
# and the test sometimes boots an AKI instead of AMI. 
3232
51
#export DEFAULT_IMAGE_NAME="cirros-0.3.0-x86_64-uec-ami"
3233
52
3234
53
# Bumped these timeouts to 60, bump higher if we decide to use
3235
54
# cloud images instead of ttylinux
3236
55
# Max time till the vm is bootable
3237
56
export BOOT_TIMEOUT=60
3238
57
# Max time to wait while vm goes from build to active state
3239
58
export ACTIVE_TIMEOUT=60
3240
59
3241
60
# Timeout for instance termination
3242
61
export TERMINATE_TIMEOUT=30
3243
62
3244
63
# Disable use of python-keyring during tests.
3245
64
export OS_NO_CACHE=1
3246
65
3247
66
###########################
3248
67
# Devstack defaults
3249
68
###########################
3250
69
3251
70
# With the addition of Keystone, to use an openstack cloud you should
3252
71
# authenticate against keystone, which returns a **Token** and **Service
3253
72
# Catalog**.  The catalog contains the endpoint for all services the user/tenant
3254
73
# has access to - including nova, glance, keystone, swift, ...  We currently
3255
74
# recommend using the 2.0 *auth api*.
3256
75
#
3257
76
# *NOTE*: Using the 2.0 *auth api* does not mean that compute api is 2.0.  We
3258
77
# will use the 1.1 *compute api*
3259
78
export NOVA_URL=${NOVA_URL:-http://$SERVICE_HOST:5000/v2.0/}
3260
79
3261
80
# Currently novaclient needs you to specify the *compute api* version.  This
3262
81
# needs to match the config of your catalog returned by Keystone.
3263
82
export NOVA_VERSION=${NOVA_VERSION:-1.1}
3264
83
3265
84
# FIXME - why does this need to be specified?
3266
85
export NOVA_REGION_NAME=${NOVA_REGION_NAME:-RegionOne}
3267
86
3268
87
# Euca2ools Certificate stuff for uploading bundles
3269
88
# You can get your certs using ./tools/get_certs.sh
3270
89
NOVARC=$(readlink -f "${BASH_SOURCE:-${0}}" 2>/dev/null) ||
3271
90
        NOVARC=$(python -c 'import os,sys; print os.path.abspath(os.path.realpath(sys.argv[1]))' "${BASH_SOURCE:-${0}}")
3272
91
NOVA_KEY_DIR=${NOVARC%/*}
3273
92
# Override this above, since devstack seems to use SERVICE_HOST to describe
3274
93
# both the nova host + keystone
3275
94
#export S3_URL=http://$SERVICE_HOST:3333
3276
95
export EC2_USER_ID=42 # nova does not use user id, but bundling requires it
3277
96
export EC2_PRIVATE_KEY=${NOVA_KEY_DIR}/pk.pem
3278
97
export EC2_CERT=${NOVA_KEY_DIR}/cert.pem
3279
98
export NOVA_CERT=${NOVA_KEY_DIR}/cacert.pem
3280
99
export EUCALYPTUS_CERT=${NOVA_CERT} # euca-bundle-image seems to require this set
3281
100
alias ec2-bundle-image="ec2-bundle-image --cert ${EC2_CERT} --privatekey ${EC2_PRIVATE_KEY} --user 42 --ec2cert ${NOVA_CERT}"
3282
101
alias ec2-upload-bundle="ec2-upload-bundle -a ${EC2_ACCESS_KEY} -s ${EC2_SECRET_KEY} --url ${S3_URL} --ec2cert ${NOVA_CERT}"
3283
102
3284
103
# set log level to DEBUG (helps debug issues)
3285
104
# export NOVACLIENT_DEBUG=1
3286
105
3287
106
# Max time from run instance command until it is running
3288
107
export RUNNING_TIMEOUT=${RUNNING_TIMEOUT:-$(($BOOT_TIMEOUT + $ACTIVE_TIMEOUT))}
3289
108
3290
109
# Max time to wait for proper IP association and dis-association.
3291
110
export ASSOCIATE_TIMEOUT=${ASSOCIATE_TIMEOUT:-15}
3292
111
0
3293
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.stable_havana'
3294
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.stable_havana	2014-06-10 23:44:37 +0000
3295
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.stable_havana	1970-01-01 00:00:00 +0000
3296
@@ -1,112 +0,0 @@
3297
1
3298
2
###########################
3299
3
# Ubuntu CI Lab Settings
3300
4
###########################
3301
5
3302
6
# List of all enabled services, compiled by inspect_environment.sh
3303
7
# and set in etc/tests/devstack.conf
3304
8
ENABLED_SERVICES={{ enabled_services }}
3305
9
3306
10
# volumes + floating_ips test checks this when determining whether
3307
11
# or not it should try to ping internal IPs
3308
12
MULTI_HOST=1
3309
13
3310
14
# The second pool of floating ips, created during jenkins
3311
15
# via /var/lib/jenkins/tools/jenkins-scripts/prepare_cloud.sh
3312
16
TEST_FLOATING_POOL={{ secondary_ip_pool }}
3313
17
3314
18
# Should point to keystone
3315
19
HOST_IP={{ keystone_host }}
3316
20
SERVICE_HOST={{ service_host }}
3317
21
3318
22
# Needed because tests use glance client directly
3319
23
GLANCE_HOST={{ glance_host }}
3320
24
3321
25
PRIVATE_NETWORK_NAME="admin_net network"
3322
26
DEFAULT_FLOATING_POOL="ext_net"
3323
27
DEFAULT_INSTANCE_TYPE="m1.small"
3324
28
3325
29
# These get created by the Keystone charm during deployment.
3326
30
# They are set as config options to the charm
3327
31
export NOVA_PROJECT_ID={{ os_tenant_name }}
3328
32
export NOVA_USERNAME={{ os_username }}
3329
33
export NOVA_PASSWORD={{ os_password }}
3330
34
3331
35
# Commit 10670d1bad6b4afd3dce9af61d22c8cd5eeded59 changed keystone token
3332
36
# auth so that they use OS_ env. variables, but doesn't translate
3333
37
# properly from existing NOVA_ ones
3334
38
export OS_TENANT_NAME=$NOVA_PROJECT_ID
3335
39
export OS_USERNAME=$NOVA_USERNAME
3336
40
export OS_PASSWORD=$NOVA_PASSWORD
3337
41
export OS_AUTH_URL="http://$HOST_IP:5000/v2.0/"
3338
42
3339
43
# Set the ec2 url so euca2ools works
3340
44
export EC2_URL="http://{{ nova_host }}:8773/services/Cloud"
3341
45
3342
46
# Also set s3 url for bundle testing
3343
47
export S3_URL="http://{{ nova_host }}:3333"
3344
48
3345
49
# Specify what image to parse out of 'glance index' so we don't accidentally
3346
50
# try spawning the test, null AMI that the bundle test publishses.
3347
51
# DISABLED: setting this actually throws off devstack's regexp 
3348
52
# and the test sometimes boots an AKI instead of AMI. 
3349
53
#export DEFAULT_IMAGE_NAME="cirros-0.3.0-x86_64-uec-ami"
3350
54
3351
55
# Bumped these timeouts to 60, bump higher if we decide to use
3352
56
# cloud images instead of ttylinux
3353
57
# Max time till the vm is bootable
3354
58
export BOOT_TIMEOUT=60
3355
59
# Max time to wait while vm goes from build to active state
3356
60
export ACTIVE_TIMEOUT=60
3357
61
3358
62
# Timeout for instance termination
3359
63
export TERMINATE_TIMEOUT=30
3360
64
3361
65
# Disable use of python-keyring during tests.
3362
66
export OS_NO_CACHE=1
3363
67
3364
68
###########################
3365
69
# Devstack defaults
3366
70
###########################
3367
71
3368
72
# With the addition of Keystone, to use an openstack cloud you should
3369
73
# authenticate against keystone, which returns a **Token** and **Service
3370
74
# Catalog**.  The catalog contains the endpoint for all services the user/tenant
3371
75
# has access to - including nova, glance, keystone, swift, ...  We currently
3372
76
# recommend using the 2.0 *auth api*.
3373
77
#
3374
78
# *NOTE*: Using the 2.0 *auth api* does not mean that compute api is 2.0.  We
3375
79
# will use the 1.1 *compute api*
3376
80
export NOVA_URL=${NOVA_URL:-http://$SERVICE_HOST:5000/v2.0/}
3377
81
3378
82
# Currently novaclient needs you to specify the *compute api* version.  This
3379
83
# needs to match the config of your catalog returned by Keystone.
3380
84
export NOVA_VERSION=${NOVA_VERSION:-1.1}
3381
85
3382
86
# FIXME - why does this need to be specified?
3383
87
export NOVA_REGION_NAME=${NOVA_REGION_NAME:-RegionOne}
3384
88
3385
89
# Euca2ools Certificate stuff for uploading bundles
3386
90
# You can get your certs using ./tools/get_certs.sh
3387
91
NOVARC=$(readlink -f "${BASH_SOURCE:-${0}}" 2>/dev/null) ||
3388
92
        NOVARC=$(python -c 'import os,sys; print os.path.abspath(os.path.realpath(sys.argv[1]))' "${BASH_SOURCE:-${0}}")
3389
93
NOVA_KEY_DIR=${NOVARC%/*}
3390
94
# Override this above, since devstack seems to use SERVICE_HOST to describe
3391
95
# both the nova host + keystone
3392
96
#export S3_URL=http://$SERVICE_HOST:3333
3393
97
export EC2_USER_ID=42 # nova does not use user id, but bundling requires it
3394
98
export EC2_PRIVATE_KEY=${NOVA_KEY_DIR}/pk.pem
3395
99
export EC2_CERT=${NOVA_KEY_DIR}/cert.pem
3396
100
export NOVA_CERT=${NOVA_KEY_DIR}/cacert.pem
3397
101
export EUCALYPTUS_CERT=${NOVA_CERT} # euca-bundle-image seems to require this set
3398
102
alias ec2-bundle-image="ec2-bundle-image --cert ${EC2_CERT} --privatekey ${EC2_PRIVATE_KEY} --user 42 --ec2cert ${NOVA_CERT}"
3399
103
alias ec2-upload-bundle="ec2-upload-bundle -a ${EC2_ACCESS_KEY} -s ${EC2_SECRET_KEY} --url ${S3_URL} --ec2cert ${NOVA_CERT}"
3400
104
3401
105
# set log level to DEBUG (helps debug issues)
3402
106
# export NOVACLIENT_DEBUG=1
3403
107
3404
108
# Max time from run instance command until it is running
3405
109
export RUNNING_TIMEOUT=${RUNNING_TIMEOUT:-$(($BOOT_TIMEOUT + $ACTIVE_TIMEOUT))}
3406
110
3407
111
# Max time to wait for proper IP association and dis-association.
3408
112
export ASSOCIATE_TIMEOUT=${ASSOCIATE_TIMEOUT:-15}
3409
113
0
3410
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/openstack.conf'
3411
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/openstack.conf	2014-06-10 23:44:37 +0000
3412
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/openstack.conf	1970-01-01 00:00:00 +0000
3413
@@ -1,26 +0,0 @@
3414
1
[DEFAULT]
3415
2
nova_host=%NOVA_HOST%
3416
3
nova_compute_host=%NOVA_COMPUTE_HOST%
3417
4
nova_volume_host=%NOVA_VOLUME_HOST%
3418
5
glance_host=%GLANCE_HOST%
3419
6
keystone_host=%KEYSTONE_HOST%
3420
7
cinder_host=%CINDER_HOST%
3421
8
quantum_host=%QUANTUM_HOST%
3422
9
service_host=%HORIZON_HOST%
3423
10
glance_image_uuid=%IMAGE_UUID%
3424
11
glance_image_name=%IMAGE_NAME%
3425
12
admin_token=%ADMIN_TOKEN%
3426
13
enabled_services=%ENABLED_SERVICES%
3427
14
3428
15
[ec2]
3429
16
access_key=%EC2_ACCESS_KEY%
3430
17
secret_key=%EC2_SECRET_KEY%
3431
18
ec2_url=%EC2_URL%
3432
19
s3_url=%S3_URL%
3433
20
ec2_ami_id=%EC2_AMI_ID%
3434
21
3435
22
[osapi]
3436
23
username=%OS_USERNAME%
3437
24
password=%OS_PASSWORD%
3438
25
auth_url=%OS_AUTH_URL%
3439
26
tenant_name=%OS_TENANT_NAME%
3440
27
0
3441
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/get-cloud-images'
3442
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/get-cloud-images	2014-06-10 23:44:37 +0000
3443
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/get-cloud-images	1970-01-01 00:00:00 +0000
3444
@@ -1,4 +0,0 @@
3445
1
#!/bin/bash -e
3446
2
3447
3
mkdir -p ~/images
3448
4
wget -O ~/images/precise-server-cloudimg-amd64-disk1.img  http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img
3449
5
0
3450
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/inspect-environment'
3451
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/inspect-environment	2014-06-10 23:44:37 +0000
3452
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/inspect-environment	1970-01-01 00:00:00 +0000
3453
@@ -1,187 +0,0 @@
3454
1
#!/bin/bash
3455
2
# Generate an envrc to be sourced and used by all tests (and possibly humans).
3456
3
#
3457
4
#   - Using juju-deployer, determine where all services ended up.
3458
5
#   - With the admin credentials configured in juju's deployment configs,
3459
6
#     generate EC2 credentials.
3460
7
#   - Dump everything into envrc using names compatable with client tools
3461
8
#
3462
9
# Additionally dump anything else needed for test suite configurations. See
3463
10
# etc/tests/all_variables for a list of what should be set in envrc.
3464
11
#
3465
12
# Also collect all package version from the nodes, save in a text file.
3466
13
# Both envrc and versions_tested are to be used as file parameters to
3467
14
# Jenkins test jobs.
3468
15
3469
16
echo "Inspecting deployed environment."
3470
17
# Discover where the services ended up
3471
18
NOVA_HOST=$(juju-deployer -f nova-cloud-controller 2>/dev/null)
3472
19
GLANCE_HOST=$(juju-deployer -f glance 2>/dev/null)
3473
20
KEYSTONE_HOST=$(juju-deployer -f keystone 2>/dev/null)
3474
21
NOVA_VOLUME_HOST=$(juju-deployer -f nova-volume 2>/dev/null)
3475
22
CINDER_HOST=$(juju-deployer -f cinder 2>/dev/null)
3476
23
NOVA_COMPUTE_HOST=$(juju-deployer -f nova-compute 2>/dev/null)
3477
24
NEUTRON_HOST=$(juju-deployer -f neutron-gateway 2>/dev/null)
3478
25
QUANTUM_HOST=$(juju-deployer -f quantum-gateway 2>/dev/null)
3479
26
HORIZON_HOST=$(juju-deployer -f openstack-dashboard 2>/dev/null)
3480
27
CEPH_HOST=$(juju-deployer -f ceph 2>/dev/null)
3481
28
SWIFT_HOST=$(juju-deployer -f swift-proxy 2>/dev/null)
3482
29
NOVA_VMWARE_HOST=$(juju-deployer -f nova-vmware 2>/dev/null)
3483
30
3484
31
# Handle the quantum -> neutron rename.
3485
32
[[ -n "$NEUTRON_HOST" ]] && QUANTUM_HOST="$NEUTRON_HOST"
3486
33
3487
34
# Ensure essential hosts are present, and build ENABLED_SERVICES so devstack
3488
35
# knows what it should be testing.
3489
36
ENABLED_SERVICES=""
3490
37
MISSING_HOSTS=""
3491
38
3492
39
[[ ! -z "$NOVA_HOST" ]] &&
3493
40
  ENABLED_SERVICES="n-api,n-crt,n-obj,n-sch" ||
3494
41
  MISSING_HOSTS="$MISSING_HOSTS NOVA_HOST"
3495
42
[[ ! -z "$GLANCE_HOST" ]] &&
3496
43
  ENABLED_SERVICES="${ENABLED_SERVICES},g-api,g-reg" ||
3497
44
  MISSING_HOSTS="$MISSING_HOSTS GLANCE_HOST"
3498
45
[[ ! -z "$KEYSTONE_HOST" ]] &&
3499
46
  ENABLED_SERVICES="${ENABLED_SERVICES},key" ||
3500
47
  MISSING_HOSTS="$MISSING_HOSTS KEYSTONE_HOST"
3501
48
3502
49
# Optional services.
3503
50
[[ ! -z "$NOVA_VOLUME_HOST" ]] && ENABLED_SERVICES="$ENABLED_SERVICES,n-vol"
3504
51
[[ ! -z "$CEPH_HOST" ]] && ENABLED_SERVICES="$ENABLED_SERVICES,ceph"
3505
52
[[ ! -z "$CINDER_HOST" ]] && ENABLED_SERVICES="$ENABLED_SERVICES,cinder,c-api,c-vol"
3506
53
[[ ! -z "$HORIZON_HOST" ]] && ENABLED_SERVICES="$ENABLED_SERVICES,horizon"
3507
54
[[ ! -z "$QUANTUM_HOST" ]] && ENABLED_SERVICES="$ENABLED_SERVICES,quantum" ||
3508
55
  ENABLED_SERVICES="$ENABLED_SERVICES,n-net"
3509
56
[[ ! -z "$SWIFT_HOST" ]] && ENABLED_SERVICES="$ENABLED_SERVICES,swift"
3510
57
3511
58
# Bail if we're missing any critical services.
3512
59
[[ -n "$MISSING_HOSTS" ]] &&
3513
60
  echo "Missing required host in deployment: $MISSING_HOSTS" && exit 1
3514
61
3515
62
# These are hard-coded in charm deployment configs, for now.
3516
63
# They could potentially be extracted from Juju on the go, via
3517
64
# juju-get
3518
65
export OS_USERNAME='admin'
3519
66
export OS_PASSWORD='Password1+'
3520
67
export OS_TENANT_NAME='admin'
3521
68
export OS_AUTH_URL="http://$KEYSTONE_HOST:5000/v2.0/"
3522
69
export ADMIN_TOKEN='ubuntutesting'
3523
70
3524
71
# Determine the tenant id for the configured tenant name.
3525
72
export TENANT_ID="$(keystone tenant-list | grep $OS_TENANT_NAME | awk '{ print $2 }')"
3526
73
3527
74
# Floating IP settings specific to our lab.  These are used in
3528
75
# Quantum network config from prepare_cloud.sh
3529
76
export QUANTUM_EXT_NET_GW=${QUANTUM_EXT_NET_GW:-172.16.1.1}
3530
77
export QUANTUM_EXT_NET_CIDR=${QUANTUM_EXT_NET_CIDR:-172.16.1.0/24}
3531
78
export QUANTUM_EXT_NET_NAME=${QUANTUM_EXT_NET_NAME:-ext_net}
3532
79
export QUANTUM_FLOAT_RANGE=${QUANTUM_FLOAT_RANGE:-172.16.1.2:172.16.1.254}
3533
80
export QUANTUM_FIXED_NET_CIDR=${QUANTUM_FIXED_NET_CIDR:-192.168.20.0/24}
3534
81
export QUANTUM_FIXED_NET_NAME=${QUANTUM_FIXED_NET_NAME:-admin_net}
3535
82
export QUANTUM_DNS=${QUANTUM_DNS:-172.16.1.1}
3536
83
3537
84
# nova-network dhcp settings, used in prepare_cloud.sh
3538
85
export NOVA_NET_PRIVATE_NET_CIDR=${NOVA_NET_PRIVATE_NET_CIDR:-192.168.21.0/24}
3539
86
export NOVA_NET_FLOATING_POOL_RANGE=${NOVA_NET_FLOATING_POOL_RANGE:-192.168.20.224/27}
3540
87
export NOVA_NET_FLOATING_POOL_RANGE_2=${NOVA_NET_FLOATING_POOL_RANGE_2:-192.168.20.223/27}
3541
88
3542
89
# Generate some EC2 creds via keystoneclient, if
3543
90
# its installed
3544
91
if which keystone >/dev/null 2>&1 ; then
3545
92
  EC2_URL=$(keystone catalog --service ec2 | awk '/ publicURL / { print $4 }')
3546
93
  S3_URL=$(keystone catalog --service s3 | awk '/ publicURL / { print $4 }')
3547
94
  CREDS=$(keystone ec2-credentials-create)
3548
95
  EC2_ACCESS_KEY=$(echo "$CREDS" | awk '/ access / { print $4 }')
3549
96
  EC2_SECRET_KEY=$(echo "$CREDS" | awk '/ secret / { print $4 }')
3550
97
else
3551
98
  echo "Couldn't find keystone client executable, skipping"\
3552
99
       " EC2 credential generation."
3553
100
fi
3554
101
3555
102
echo "Writing envrc"
3556
103
3557
104
cat >envrc <<END
3558
105
export NOVA_HOST=$NOVA_HOST
3559
106
export GLANCE_HOST=$GLANCE_HOST
3560
107
export KEYSTONE_HOST=$KEYSTONE_HOST
3561
108
export HORIZON_HOST=$HORIZON_HOST
3562
109
export CINDER_HOST=$CINDER_HOST
3563
110
export NOVA_VOLUME_HOST=$NOVA_VOLUME_HOST
3564
111
export NOVA_COMPUTE_HOST=$NOVA_COMPUTE_HOST
3565
112
export SWIFT_HOST=$SWIFT_HOST
3566
113
export OS_USERNAME=$OS_USERNAME
3567
114
export OS_PASSWORD=$OS_PASSWORD
3568
115
export OS_TENANT_NAME=$OS_TENANT_NAME
3569
116
export TENANT_ID=$TENANT_ID
3570
117
export OS_AUTH_URL=$OS_AUTH_URL
3571
118
export OS_REGION_NAME=RegionOne
3572
119
export ADMIN_TOKEN=$ADMIN_TOKEN
3573
120
export TEMPEST_USER_1=tempest-1
3574
121
export TEMPEST_USER_2=tempest-2
3575
122
export TEMPEST_USERS_PASSWORD=ubuntu
3576
123
export TEMPEST_TENANT_1=tempest-tenant-1
3577
124
export TEMPEST_TENANT_2=tempest-tenant-2
3578
125
export ENABLED_SERVICES=$ENABLED_SERVICES
3579
126
END
3580
127
3581
128
if [[ -n "$EC2_URL" ]] ; then
3582
129
  cat >>envrc <<END
3583
130
export EC2_URL=$EC2_URL
3584
131
export S3_URL=$S3_URL
3585
132
export EC2_ACCESS_KEY=$EC2_ACCESS_KEY
3586
133
export EC2_SECRET_KEY=$EC2_SECRET_KEY
3587
134
END
3588
135
fi
3589
136
3590
137
if [[ -n "$QUANTUM_HOST" ]] ; then
3591
138
  cat >>envrc <<END
3592
139
export NEUTRON_AVAILABLE=true
3593
140
export QUANTUM_AVAILABLE=true
3594
141
export QUANTUM_HOST=$QUANTUM_HOST
3595
142
export QUANTUM_EXT_NET_GW=$QUANTUM_EXT_NET_GW
3596
143
export QUANTUM_EXT_NET_CIDR=$QUANTUM_EXT_NET_CIDR
3597
144
export QUANTUM_EXT_NET_NAME=$QUANTUM_EXT_NET_NAME
3598
145
export QUANTUM_FLOAT_RANGE=$QUANTUM_FLOAT_RANGE
3599
146
export QUANTUM_FIXED_NET_CIDR=$QUANTUM_FIXED_NET_CIDR
3600
147
export QUANTUM_FIXED_NET_NAME=$QUANTUM_FIXED_NET_NAME
3601
148
export QUANTUM_DNS=$QUANTUM_DNS
3602
149
END
3603
150
else
3604
151
  cat >>envrc <<END
3605
152
export NEUTRON_AVAILABLE=false
3606
153
export QUANTUM_AVAILABLE=false
3607
154
export NOVA_NET_PRIVATE_NET_CIDR=$NOVA_NET_PRIVATE_NET_CIDR
3608
155
export NOVA_NET_FLOATING_POOL_RANGE=$NOVA_NET_FLOATING_POOL_RANGE
3609
156
export NOVA_NET_FLOATING_POOL_RANGE_2=$NOVA_NET_FLOATING_POOL_RANGE_2
3610
157
END
3611
158
fi
3612
159
3613
160
if [[ -n "$SWIFT_HOST" ]] ; then
3614
161
  echo "export SWIFT_AVAILABLE=false" >>envrc
3615
162
else
3616
163
  echo "export SWIFT_AVAILABLE=false" >>envrc
3617
164
fi
3618
165
3619
166
if [[ -n "$CEPH_HOST" ]] ; then
3620
167
  echo "export VOLUME_BACKEND=ceph" >>envrc
3621
168
else
3622
169
  echo "export VOLUME_BACKEND=iSCSI" >>envrc
3623
170
fi
3624
171
3625
172
# TODO: Extend this to support detecting other computes (lxc)
3626
173
if [[ -n "$NOVA_COMPUTE_HOST" ]] ; then
3627
174
  virt_type=$(python -c "
3628
175
import yaml
3629
176
import subprocess
3630
177
conf = yaml.load(subprocess.check_output(['juju', 'get', 'nova-compute']))
3631
178
if 'value' in conf['settings']['virt-type']:
3632
179
    print conf['settings']['virt-type']['value']
3633
180
else:
3634
181
    print 'kvm'
3635
182
")
3636
183
  [[ -z "$virt_type" ]] && virt_type="kvm"
3637
184
  echo "export COMPUTE_BACKEND=$virt_type" >>envrc
3638
185
elif [[ -n "$NOVA_VMWARE_HOST" ]] ; then
3639
186
  echo "export COMPUTE_BACKEND=vmware" >>envrc
3640
187
fi
3641
188
0
3642
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare-cloud'
3643
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare-cloud	2014-06-10 23:44:37 +0000
3644
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare-cloud	1970-01-01 00:00:00 +0000
3645
@@ -1,57 +0,0 @@
3646
1
#!/bin/bash -xe
3647
2
# Utility script to:
3648
3
# - Upload an image to glance, cirros by default.  
3649
4
#   Since our Jenkins host is cut off from the outside
3650
5
#   world, images are hard-coded and expected to exist in
3651
6
#   following locations locally:
3652
7
#     $HOME/images/precise-server-cloudimg-amd64.tar.gz
3653
8
#     $HOME/images/ttylinux-uec-i686-12.1_2.6.35-22_1.tar.gz
3654
9
#     $HOME/images/cirros-0.3.0-x86_64-uec.tar.gz
3655
10
#
3656
11
# - Configure networks in Nova's database.  Also hard-coded here
3657
12
#   to configure:
3658
13
#     - private instance network 10.14.4.24,
3659
14
#        multi_host, bridge=br100, bridge_interface=eth1
3660
15
#     - default floating ip pool 192.168.20.224/27
3661
16
#     - secondary floating ip pool 192.168.20.223/27
3662
17
#
3663
18
# This script expects:
3664
19
#   - Environment contains any variables needed by glance's client tools
3665
20
#     (use inspect_environment.sh to generate envrc containing these)
3666
21
#   - Passwordless ssh access to nova-cloud-controller, and passwordless
3667
22
#     sudo access for the ubuntu user (to call nova-manage)
3668
23
3669
24
cwd=`dirname $0`
3670
25
3671
26
function error_out() {
3672
27
  echo "* [ERROR prepare_cloud]: $@" && exit 1
3673
28
}
3674
29
3675
30
function log() {
3676
31
  echo "- [prepare_cloud]: $@"
3677
32
}
3678
33
3679
34
OS_RELEASE="$1"
3680
35
3681
36
# These hosts should have all been set in environment, via envrc
3682
37
missing=""
3683
38
[[ -z "$NOVA_HOST" ]] && missing="$missing NOVA_HOST"
3684
39
[[ -z "$OS_USERNAME" ]] && missing="$missing OS_USERNAME"
3685
40
[[ -z "$OS_PASSWORD" ]] && missing="$missing OS_PASSWORD"
3686
41
[[ -z "$OS_AUTH_URL" ]] && missing="$missing OS_AUTH_URL"
3687
42
[[ -z "$OS_TENANT_NAME" ]] && missing="$missing OS_TENANT_NAME"
3688
43
[[ -n "$missing" ]] && error_out "Missing from environment: $missing"
3689
44
3690
45
export IMG_DIR=${IMG_DIR:-$HOME/images}
3691
46
export DEFAULT_IMAGE=${DEFAULT_IMAGE:-$IMG_DIR/precise-server-cloudimg-amd64-disk1.img}
3692
47
export VMWARE_IMAGE=${VMWARE_IMAGE:-$IMG_DIR/vmware/precise.vmdk}
3693
48
export LXC_IMAGE=${LXC_IMAGE:-$IMG_DIR/lxc/precise-server-cloudimg-amd64.img
3694
49
}
3695
50
3696
51
[[ ! -e $cwd/prepare_cloud/$OS_RELEASE ]] &&
3697
52
  error_out "Could not load prep library from $cwd/prepare_cloud/$OS_RELEASE"
3698
53
3699
54
. $cwd/prepare_cloud/$OS_RELEASE
3700
55
3701
56
setup_network
3702
57
publish_image ubuntu
3703
58
0
3704
=== removed directory 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare_cloud'
3705
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare_cloud/essex'
3706
=== target was u'folsom'
3707
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare_cloud/folsom'
3708
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare_cloud/folsom	2014-06-10 23:44:37 +0000
3709
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare_cloud/folsom	1970-01-01 00:00:00 +0000
3710
@@ -1,147 +0,0 @@
3711
1
#!/bin/bash -xe
3712
2
# Utility script to:
3713
3
# - Upload an image to glance, cirros by default.
3714
4
#   Since our Jenkins host is cut off from the outside
3715
5
#   world, images are hard-coded and expected to exist in
3716
6
#   following locations locally:
3717
7
#
3718
8
#     $HOME/cirros-0.3.0-x86_64-disk.img
3719
9
#     $HOME/quantal-server-cloudimg-amd64-disk1.img
3720
10
#
3721
11
# - Configure networks in Nova's database.  Also hard-coded here
3722
12
#   to configure:
3723
13
#     - private instance network 192.168.21.0/24,
3724
14
#        multi_host, bridge=br100, bridge_interface=eth1
3725
15
#     - default floating ip pool 192.168.20.224/27
3726
16
#     - secondary floating ip pool 192.168.20.223/27
3727
17
#
3728
18
# This script expects:
3729
19
#   - Environment contains any variables needed by glance's client tools
3730
20
#     (use inspect_environment.sh to generate envrc containing these)
3731
21
#   - Passwordless ssh access to nova-cloud-controller, and passwordless
3732
22
#     sudo access for the ubuntu user (to call nova-manage)
3733
23
3734
24
3735
25
function setup_nova_network() {
3736
26
  # Conditionally create nova's instance network and 2 floating ip pools
3737
27
  # this takes place on the cloud-controller using nova-manage
3738
28
  log "Logging into $NOVA_HOST and creating network via nova-manage"
3739
29
  ssh ubuntu@"$NOVA_HOST" "[[ -e ~/network-created ]] || \
3740
30
                    (sudo nova-manage network create private $NOVA_NET_PRIVATE_NET_CIDR \
3741
31
                     1 256 --bridge=br100 --bridge_interface=eth1 --multi_host=T \
3742
32
                     && touch ~/network-created)" ||
3743
33
                   error_out "Could not create network."
3744
34
3745
35
  log "Logging into $NOVA_HOST and creating default floating IP pool"
3746
36
  ssh ubuntu@"$NOVA_HOST" "[[ -e ~/floating-pool1-created ]] || \
3747
37
                   (sudo nova-manage floating create $NOVA_NET_FLOATING_POOL_RANGE \
3748
38
                    && touch ~/floating-pool1-created)" ||
3749
39
                   error_out "Could not create default floating pool."
3750
40
3751
41
  log "Logging into $NOVA_HOST and creating secondary floating IP pool"
3752
42
  ssh ubuntu@"$NOVA_HOST" "[[ -e ~/floating-pool2-created ]] || \
3753
43
                   (sudo nova-manage floating create --ip_range=$NOVA_NET_FLOATING_POOL_RANGE_2 \
3754
44
                     --pool=test_range && touch ~/floating-pool2-created)" ||
3755
45
                   error_out "ERROR: Could not create secondary floatig pool."
3756
46
}
3757
47
3758
48
function setup_quantum_network() {
3759
49
  # SSHes to nova-c-c and uses the charm's quantum utility script with
3760
50
  # creds generated by inspect_environment.sh.
3761
51
  ssh ubuntu@"$NOVA_HOST" "\
3762
52
                  OS_USERNAME=$OS_USERNAME OS_PASSWORD=$OS_PASSWORD \
3763
53
                  OS_TENANT_NAME=$OS_TENANT_NAME  OS_AUTH_URL=$OS_AUTH_URL  \
3764
54
                  OS_REGION_NAME=RegionOne \
3765
55
                  quantum-ext-net -g $QUANTUM_EXT_NET_GW \
3766
56
                  -c $QUANTUM_EXT_NET_CIDR \
3767
57
                  -f $QUANTUM_FLOAT_RANGE \
3768
58
                  -t services \
3769
59
                  $QUANTUM_EXT_NET_NAME"
3770
60
  ssh ubuntu@"$NOVA_HOST" "\
3771
61
                OS_USERNAME=$OS_USERNAME OS_PASSWORD=$OS_PASSWORD \
3772
62
                OS_TENANT_NAME=$OS_TENANT_NAME OS_AUTH_URL=$OS_AUTH_URL  \
3773
63
                OS_REGION_NAME=RegionOne \
3774
64
                quantum-tenant-net -t admin -r provider-router \
3775
65
                $QUANTUM_FIXED_NET_NAME $QUANTUM_FIXED_NET_CIDR"
3776
66
3777
67
  # save the IDs of new network to envrc for later testing.
3778
68
  ext_net_id=$(neutron net-list | grep "$QUANTUM_EXT_NET_NAME " | \
3779
69
               awk '{ print $2 }')
3780
70
  fixed_net_id=$(neutron net-list | grep "$QUANTUM_FIXED_NET_NAME " | \
3781
71
               awk '{ print $2 }')
3782
72
  ext_net_router=$(neutron router-list | grep "$ext_net_id" | \
3783
73
               grep provider-router | awk '{ print $2 }')
3784
74
  [[ -e envrc ]] &&
3785
75
    echo "export QUANTUM_EXT_NET_ID=$ext_net_id" >>envrc &&
3786
76
    echo "export QUANTUM_FIXED_NET_ID=$fixed_net_id" >>envrc &&
3787
77
    echo "export QUANTUM_EXT_NET_ROUTER_ID=$ext_net_router" >>envrc
3788
78
}
3789
79
3790
80
function setup_network() {
3791
81
  if (echo $ENABLED_SERVICES | grep -q quantum) ||
3792
82
     (echo $ENABLED_SERVICES | grep -q neutron) ; then
3793
83
    setup_quantum_network
3794
84
  else
3795
85
    setup_nova_network
3796
86
  fi
3797
87
}
3798
88
3799
89
3800
90
function ubuntu_image() {
3801
91
  # certain compute backends require certain image formats
3802
92
  case "$COMPUTE_BACKEND" in
3803
93
    "vmware") echo $VMWARE_IMAGE ;;
3804
94
    "lxc") echo $LXC_IMAGE ;;
3805
95
    *) echo $DEFAULT_IMAGE ;;
3806
96
  esac
3807
97
}
3808
98
3809
99
function glance_args() {
3810
100
  # certain compute backends require images be published with special
3811
101
  # properties
3812
102
  # NOTE: assumes vmware images are sparse. needs to be adjusted
3813
103
  #       publishing preallocated or thin images
3814
104
  case "$COMPUTE_BACKEND" in
3815
105
    "vmware") echo "--disk-format=vmdk --container-format=bare " \
3816
106
                   "--is-public=true --property vmware-adaptertype=ide " \
3817
107
                   "--property vmware-ostype=ubuntuGuest " \
3818
108
                   "--property vmware_disktype=sparse" ;;
3819
109
    "lxc") echo "--container-format=bare --disk-format=raw --property hypervisor_type=lxc" \
3820
110
                "--is-public true" ;;
3821
111
    *) echo "--is-public=true --container-format=ami --disk-format=ami" ;;
3822
112
  esac
3823
113
}
3824
114
3825
115
function publish_image() {
3826
116
  # Publish a cloud img directly into glance using glance client
3827
117
  case "$1" in
3828
118
    "ubuntu") IMG="$(ubuntu_image)" ;;
3829
119
    "cirros"|*) IMG="$IMG_DIR/cirros-0.3.0-x86_64-disk.img" ;;
3830
120
  esac
3831
121
  [[ ! -e "$IMG" ]] && error_out "Could not find IMG @ $IMG"
3832
122
  log "Using IMG @ $IMG."
3833
123
3834
124
  # Clear out any existing images.
3835
125
  for i in $(glance image-list | grep active | awk '{ print $2 }') ; do
3836
126
    log "Deleting existing image from glance with id $i"
3837
127
    glance image-delete $i
3838
128
  done
3839
129
3840
130
  IMG_NAME=$(echo ${IMG##*/} | sed -e 's/\.img//g')
3841
131
  args="$(glance_args)"
3842
132
  RESP=$(glance image-create --name="$IMG_NAME-ami" $args < $IMG)
3843
133
  IMG_UUID=$(echo "$RESP" | grep " id " | awk '{ print $4 }')
3844
134
  log "Published AMI for $IMG_NAME with ID $IMG_UUID"
3845
135
  log "Cleaning up $IMG_NAME..."
3846
136
  rm -rf $IMG_NAME*
3847
137
3848
138
  # Find the correpsonding EC2 AMI ID that was assigned the the Glance image.
3849
139
  EC2_IMG_UUID=$(euca-describe-images | grep "$IMG_NAME-ami" | awk '{ print $2 }'  | head -n1)
3850
140
3851
141
  # if this is being run as part of jenkins job, its likely there is an envrc
3852
142
  # in the pwd that we care to update with the name of the image we just published.
3853
143
  [[ -e envrc ]] && \
3854
144
    echo "export IMAGE_NAME=$IMG_NAME-ami" >>envrc && \
3855
145
    echo "export IMAGE_UUID=$IMG_UUID" >>envrc
3856
146
    echo "export EC2_IMG_UUID=$EC2_IMG_UUID" >>envrc
3857
147
}
3858
148
0
3859
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare_cloud/grizzly'
3860
=== target was u'folsom'
3861
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare_cloud/havana'
3862
=== target was u'grizzly'
3863
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare_cloud/icehouse'
3864
=== target was u'havana'
3865
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/verify-cloud'
3866
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/verify-cloud	2014-06-10 23:44:37 +0000
3867
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/verify-cloud	1970-01-01 00:00:00 +0000
3868
@@ -1,6 +0,0 @@
3869
1
#!/bin/bash -e
3870
2
3871
3
source envrc
3872
4
base=$(dirname $0)
3873
5
${base}/configure-tests
3874
6
nosetests -v
3875
7
0
3876
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-prereqs-install.sh'
3877
--- usr/lib/orange-box/examples/openstack/complex/openstack-prereqs-install.sh	2014-06-10 23:44:37 +0000
3878
+++ usr/lib/orange-box/examples/openstack/complex/openstack-prereqs-install.sh	1970-01-01 00:00:00 +0000
3879
@@ -1,183 +0,0 @@
3880
1
#!/bin/bash
3881
2
set -ex
3882
3
sudo apt-get install --yes libvirt-bin virtinst qemu-kvm juju iptables-persistent juju-deployer \
3883
4
  python-keystoneclient python-novaclient python-cinderclient python-glanceclient python-neutronclient \
3884
5
  python-nose git python-swiftclient uuid
3885
6
[ -d ~/isos ] || mkdir ~/isos
3886
7
[ -f ~/isos/ubuntu-12.04.3-server-amd64.iso ] || wget http://releases.ubuntu.com/precise/ubuntu-12.04.3-server-amd64.iso -O ~/isos/ubuntu-12.04.3-server-amd64.iso
3887
8
3888
9
grep 'libvirtd.*ubuntu' /etc/group || (echo "Adding ubuntu user to libvirtd group" && sudo adduser ubuntu libvirtd && echo "Please re-login and run again" && exit 0)
3889
10
3890
11
[ -f /home/ubuntu/.ssh/id_rsa ] || echo -e "\n\n\n" | ssh-keygen -N "" -t rsa -f /home/ubuntu/.ssh/id_rsa
3891
12
maas-cli admin sshkeys list | grep id || maas-cli admin sshkeys new key="$(cat ~/.ssh/id_rsa.pub)"
3892
13
3893
14
# Make Logical Volumes for the guests
3894
15
echo "Skipping setup of LVMs"
3895
16
# sudo vgscan | grep BigDisk || sudo vgcreate BigDisk /dev/sdb1
3896
17
3897
18
# for service in juju lds neutron; do
3898
19
#     sudo lvdisplay | grep ${service}_disk && sudo lvremove -f BigDisk/${service}_disk
3899
20
# done
3900
21
# sudo lvcreate -L20G -n juju_disk BigDisk
3901
22
# sudo lvcreate -L800G -n lds_disk BigDisk
3902
23
# sudo lvcreate -L20G -n neutron_disk BigDisk
3903
24
3904
25
sudo tee /etc/init/maas-pserv.override << EOF
3905
26
# Don't start maas-pserv until bridge has started
3906
27
start on net-device-up IFACE=br1
3907
28
EOF
3908
29
3909
30
# Setup networking
3910
31
# Add to /etc/network/interfaces
3911
32
grep br0 /etc/network/interfaces || sudo tee /etc/network/interfaces <<EOF
3912
33
# This file describes the network interfaces available on your system
3913
34
# and how to activate them. For more information, see interfaces(5).
3914
35
3915
36
# The loopback network interface
3916
37
auto lo
3917
38
iface lo inet loopback
3918
39
3919
40
3920
41
# USB NIC; connect to LAN.
3921
42
#auto em1
3922
43
#iface em1 inet dhcp
3923
44
3924
45
#auto eth0
3925
46
#iface eth0 inet dhcp
3926
47
3927
48
# External connectivity
3928
49
auto br0
3929
50
iface br0 inet dhcp
3930
51
    bridge_ports eth0
3931
52
    bridge_stp off
3932
53
    bridge_fd 0
3933
54
    bridge_maxwait 0
3934
55
3935
56
# The interface to the internal network.
3936
57
auto br1
3937
58
iface br1 inet static
3938
59
    address 10.14.4.1
3939
60
    netmask 255.255.255.0
3940
61
    broadcast 10.14.4.255
3941
62
    network 10.14.4.0
3942
63
    bridge_ports em1
3943
64
    bridge_stp off
3944
65
    bridge_fd 0
3945
66
    bridge_maxwait 0
3946
67
    dns-nameservers 10.14.4.1
3947
68
    dns-search orangebox.org
3948
69
3949
70
EOF
3950
71
3951
72
sudo sed -i -e's/eth0/br0/g' /etc/iptables/rules.v4
3952
73
sudo sed -i -e's/em1/br1/g' /etc/iptables/rules.v4
3953
74
sudo service iptables-persistent restart
3954
75
3955
76
cluster_controller_uuid=$(maas-cli admin node-groups list | grep uuid | cut -d'"' -f4)
3956
77
# Replace MAAS management of em1 with br1
3957
78
maas-cli admin node-group-interface delete ${cluster_controller_uuid} em1 && maas-cli admin node-group-interfaces new ${cluster_controller_uuid} interface=br1 ip=10.14.4.1 subnet_mask=255.255.255.0 broadcast_ip=10.14.4.255 router_ip=10.14.4.1 ip_range_low=10.14.4.20 ip_range_high=10.14.4.254 management=2 && sudo service maas-dhcp-server restart && sudo service maas-pserv restart && sudo service maas-cluster-celery restart && sudo service maas-region-celery restart
3958
79
3959
80
sudo sed -ie 's/#prepend domain-name-servers 127.0.0.1;/prepend domain-name-servers 10.14.4.1;/' /etc/dhcp/dhclient.conf
3960
81
virsh net-info default && virsh net-destroy default && virsh net-undefine default
3961
82
3962
83
# create bridge on 172.16.1.0/24 for neutron
3963
84
virsh net-info bridge2 || ( virsh net-define bridge2.xml && virsh net-autostart bridge2 && virsh net-start bridge2 )
3964
85
3965
86
# cat >/tmp/maas-private.xml <<EOF
3966
87
# <network>
3967
88
#   <name>maas-private</name>
3968
89
#   <uuid>c46a86d4-3111-ddfa-1118-922b78d37600</uuid>
3969
90
#   <bridge name='virbr1' stp='on' delay='0' />
3970
91
#   <mac address='52:54:11:26:F2:BC'/>
3971
92
# </network>
3972
93
# EOF
3973
94
3974
95
# cat >/tmp/maas-external.xml <<EOF
3975
96
# <network>
3976
97
#   <name>maas-external</name>
3977
98
#   <uuid>c46a86d4-3111-ddfa-1118-922b78201208</uuid>
3978
99
#   <bridge name='virbr2' stp='on' delay='0' />
3979
100
#   <mac address='52:54:11:26:F2:BD'/>
3980
101
# </network>
3981
102
# EOF
3982
103
# for net in maas-private maas-external; do
3983
104
#     virsh net-define /tmp/$net.xml
3984
105
#     virsh net-autostart $net
3985
106
#     virsh net-start $net
3986
107
# done
3987
108
sudo ifup br0
3988
109
sudo ifup br1
3989
110
[ -d /home/maas ] || sudo install -d /home/maas --owner maas --group maas
3990
111
sudo chsh maas -s /bin/bash
3991
112
[ -d /home/maas/.ssh ] || echo -e "\n\n\n" | sudo -u maas ssh-keygen -N "" -t rsa -f /home/maas/.ssh/id_rsa
3992
113
[ -f /home/maas/.ssh/config ] || sudo -u maas tee /home/maas/.ssh/config <<EOF
3993
114
Host *
3994
115
   UserKnownHostsFile /dev/null
3995
116
   StrictHostKeyChecking no
3996
117
EOF
3997
118
grep 'maas@' ~/.ssh/authorized_keys || sudo cat /home/maas/.ssh/id_rsa.pub | tee -a /home/ubuntu/.ssh/authorized_keys
3998
119
# 10.14.4.1 known hosts
3999
120
4000
121
# create the kvms, not in loop due to neutron being different
4001
122
echo -e "virt-install juju instance"
4002
123
virsh list --all --name | grep juju || sudo virt-install --name juju --ram 4096 --disk path=/mnt/juju_disk,size=20 --vcpus=2 --os-type=linux --pxe --network=bridge=br1 --boot network || true
4003
124
echo -e "virt-install lds instance"
4004
125
virsh list --all --name | grep lds || sudo virt-install --name lds --ram 4096 --disk path=/mnt/lds_disk,size=20 --vcpus=2 --os-type=linux --pxe --network=bridge=br1 --boot network || true
4005
126
echo -e "virt-install neutron instance"
4006
127
virsh list --all --name | grep neutron || sudo virt-install --name neutron --ram 4096 --disk path=/mnt/neutron_disk,size=20 --vcpus=2 --os-type=linux --pxe --network=bridge=virbr1 --network=bridge=br1 --boot network || true
4007
128
4008
129
# loop to fixup the kvms
4009
130
for system in juju lds neutron; do
4010
131
    mac=$(virsh dumpxml $system | python -c 'import sys, lxml.etree; print list(lxml.etree.parse(sys.stdin).iter("mac"))[0].get("address")')
4011
132
    system_id=$(maas-cli admin nodes list mac_address=$mac | grep system_id | cut -d'"' -f4)
4012
133
    # until [ $system_id ]; do
4013
134
    #     system_id=$(maas-cli admin nodes list mac_address=$mac | grep system_id | cut -d'"' -f4)
4014
135
    #     sleep 10
4015
136
    # done
4016
137
    maas-cli admin node update $system_id hostname=$system.master power_type=virsh power_parameters_power_address=qemu+ssh://ubuntu@10.14.4.1/system power_parameters_power_id=$system
4017
138
    maas-cli admin tags new name=$system || true
4018
139
    maas-cli admin tag update-nodes $system add=$system_id
4019
140
    maas-cli admin tag update-nodes use-fastpath-installer add=$system_id
4020
141
    maas-cli admin node commission $system_id || true
4021
142
done
4022
143
4023
144
4024
145
for system in juju lds neutron; do
4025
146
    mac=$(virsh dumpxml $system | python -c 'import sys, lxml.etree; print list(lxml.etree.parse(sys.stdin).iter("mac"))[0].get("address")')
4026
147
    system_id=$(maas-cli admin nodes list mac_address=$mac | grep system_id | cut -d'"' -f4)
4027
148
    echo "Waiting for $system to be Ready"
4028
149
    until maas-cli admin node read $system_id | grep status | awk {'print $2'} | grep '4,'; do echo -n '.'; sleep 5; done
4029
150
done
4030
151
4031
152
4032
153
# set all physical nodes to use fast installer
4033
154
4034
155
for system in node1 node2 node3 node4 node5 node6 node7 node8 node9; do
4035
156
   system_id=$(maas-cli admin nodes list hostname=$system.master | grep system_id | cut -d'"' -f4)
4036
157
   maas-cli admin tag update-nodes use-fastpath-installer add=$system_id
4037
158
done
4038
159
4039
160
#Add Tag NUC to identify physical nodes
4040
161
maas-cli admin tag new name='nuc' comment='physical nuc nodes' definition='//node[@id="core"]/product = "D53427RKE"'
4041
162
4042
163
# DNS forwarding, /etc/bind/named.conf.options
4043
164
4044
165
[ -d ~/.juju ] || mkdir ~/.juju
4045
166
4046
167
maas_oauth=$(maas-cli list | awk '{ print $3 }')
4047
168
4048
169
cat > ~/.juju/environments.yaml <<EOF
4049
170
environments:
4050
171
    maas:
4051
172
        type: maas
4052
173
        admin-secret: Password1+
4053
174
4054
175
        # maas-server specifies the location of the MAAS server. It must
4055
176
        # specify the base path.
4056
177
        maas-server: 'http://10.14.4.1/MAAS/'
4057
178
        
4058
179
        # maas-oauth holds the OAuth credentials from MAAS.
4059
180
        maas-oauth: '$maas_oauth'
4060
181
EOF
4061
182
4062
183
echo "Install script finished"
4063
184
0
4064
=== removed file 'usr/lib/orange-box/examples/openstack/complex/remove-kvms.sh'
4065
--- usr/lib/orange-box/examples/openstack/complex/remove-kvms.sh	2014-06-10 23:44:37 +0000
4066
+++ usr/lib/orange-box/examples/openstack/complex/remove-kvms.sh	1970-01-01 00:00:00 +0000
4067
@@ -1,53 +0,0 @@
4068
1
#!/bin/bash
4069
2
#
4070
3
# BE FOREWARNED!
4071
4
#
4072
5
# THIS SCRIPT
4073
6
#	TAKES NODES 1-9 BACK TO BASE READY STATE
4074
7
#	ELIMINATES ALL KVMS FROM NODE 0
4075
8
#	TAKES MAAS STATE BACK TO BASE LEVELS
4076
9
#
4077
10
# THIS SCRIPT WILL LEAVE ALONE
4078
11
# 	The LVM setup
4079
12
#	The networking setup (including DNS/DHCP info)
4080
13
#	The MAAS basic setup (including maas user/ssh,
4081
14
#	  but not juju environment/bootstrap info)
4082
15
#
4083
16
4084
17
set -e
4085
18
echo -e "Clear juju environment with juju destroy-environment"
4086
19
echo -e "This will set nodes 1-9 back to Ready state in MAAS"
4087
20
echo -e "and delete the ~/.juju/environments dir."
4088
21
juju destroy-environment maas || true
4089
22
rm -rf ~/.juju/environments
4090
23
4091
24
echo -e "Removing the ssh known_hosts file"
4092
25
rm -f ~/.ssh/known_hosts
4093
26
4094
27
echo -e " Delete virtual nodes from MAAS state"
4095
28
#nodes=$(maas-cli admin tag nodes virtual | grep system_id | sed -e 's/", $//' -e 's/^.*"//')
4096
29
#for node in $nodes;do 
4097
30
#	echo "Deleting virtual node: $node from MAAS."
4098
31
#	maas-cli admin node delete $node
4099
32
#done
4100
33
for nodename in juju lds neutron; do
4101
34
	system_id=$(maas-cli admin nodes list hostname=$nodename.master | grep system_id | cut -d'"' -f4)
4102
35
	echo -e  "Deleting virtual node: $nodename == $system_id from MAAS."
4103
36
	maas-cli admin node delete $system_id || :
4104
37
done
4105
38
4106
39
echo -e "Deleting KVMs from node 0"
4107
40
4108
41
set +e # We want to try all of these
4109
42
sudo virsh destroy juju
4110
43
sudo virsh destroy lds
4111
44
sudo virsh destroy neutron
4112
45
sudo virsh undefine juju
4113
46
sudo virsh undefine lds
4114
47
sudo virsh undefine neutron
4115
48
set -e
4116
49
4117
50
echo -e "Removing virtual bridge2"
4118
51
sudo virsh net-destroy bridge2
4119
52
4120
53
echo -e "Done."
4121
54
0
4122
=== removed file 'usr/lib/orange-box/examples/openstack/havana/99-cleanup.sh'
4123
--- usr/lib/orange-box/examples/openstack/havana/99-cleanup.sh	2014-07-16 07:31:25 +0000
4124
+++ usr/lib/orange-box/examples/openstack/havana/99-cleanup.sh	1970-01-01 00:00:00 +0000
4125
@@ -1,8 +0,0 @@
4126
1
#!/bin/bash
4127
2
4128
3
#Destroy everything
4129
4
juju destroy-environment maas
4130
5
export AMT_PASSWORD=Password1+
4131
6
for i in $(seq 11 19); do
4132
7
	yes | amttool 10.14.4.$i powerdown >/dev/null 2>&1
4133
8
done
4134
9
0
4135
=== removed file 'usr/lib/orange-box/examples/openstack/icehouse/precise/00-bootstrap.sh'
4136
--- usr/lib/orange-box/examples/openstack/icehouse/precise/00-bootstrap.sh	2014-07-14 07:26:29 +0000
4137
+++ usr/lib/orange-box/examples/openstack/icehouse/precise/00-bootstrap.sh	1970-01-01 00:00:00 +0000
4138
@@ -1,18 +0,0 @@
4139
1
#!/bin/bash
4140
2
#Canonical Micro-Cluster Demo Preparation
4141
3
echo "checking for existing Juju environment..."
4142
4
juju status && echo "Existing deployment found, exiting." && exit
4143
5
4144
6
rm ~/.ssh/known_hosts
4145
7
4146
8
juju env maas
4147
9
4148
10
echo "Deploying Juju Bootstrap node to Virtual machine: juju.local using tags=juju"
4149
11
juju bootstrap --upload-tools=true --constraints "tags=bootstrap" --show-log --series=precise,trusty
4150
12
4151
13
echo "unset constraints"
4152
14
juju set-constraints tags=""
4153
15
echo "Deploying Juju-gui to bootstrap node"
4154
16
juju deploy --to 0 juju-gui
4155
17
juju expose juju-gui
4156
18
4157
19
0
4158
=== modified file 'usr/lib/orange-box/examples/openstack/icehouse/precise/01-deploy.sh'
4159
--- usr/lib/orange-box/examples/openstack/icehouse/precise/01-deploy.sh	2014-07-14 07:26:29 +0000
4160
+++ usr/lib/orange-box/examples/openstack/icehouse/precise/01-deploy.sh	2014-07-24 01:23:40 +0000
4161
@@ -4,7 +4,7 @@
4162
4
set -ex
4
set -ex
4163
5
5
4164
6
juju set-constraints tags=
6
juju set-constraints tags=
4166
7
juju-deployer -e maas -c  icehouseOB.yaml
7
juju-deployer -c  icehouseOB.yaml
4167
8
8
4168
9
9
4169
10
echo "Deployment finished"
10
echo "Deployment finished"
4170
11
11
4171
=== removed file 'usr/lib/orange-box/examples/openstack/icehouse/precise/02-configure-openstack.sh'
4172
--- usr/lib/orange-box/examples/openstack/icehouse/precise/02-configure-openstack.sh	2014-07-14 07:26:29 +0000
4173
+++ usr/lib/orange-box/examples/openstack/icehouse/precise/02-configure-openstack.sh	1970-01-01 00:00:00 +0000
4174
@@ -1,72 +0,0 @@
4175
1
#!/bin/bash
4176
2
4177
3
set -e
4178
4
4179
5
echo "This command is run to configure an Orange-Box Openstack deployment"
4180
6
4181
7
### assume you ran this :  sudo apt-get install python-keystone python-novaclient zile python-neutron python-glanceclient
4182
8
unset http_proxy 
4183
9
unset https_proxy
4184
10
4185
11
QUANTUM_EXT_NET_GW="10.14.4.1"
4186
12
QUANTUM_EXT_NET_CIDR="10.14.4.0/24"
4187
13
QUANTUM_EXT_NET_NAME="ext_net"
4188
14
QUANTUM_DNS="10.14.4.1"
4189
15
QUANTUM_FLOAT_RANGE_START="10.14.4.20"
4190
16
QUANTUM_FLOAT_RANGE_END="10.14.4.49"
4191
17
4192
18
QUANTUM_FIXED_NET_CIDR="192.168.14.0/24"
4193
19
QUANTUM_FIXED_NET_NAME="admin_net"
4194
20
4195
21
keystone=$(juju status keystone | grep public-address | head -1 | awk '{print $2}')
4196
22
4197
23
echo "export SERVICE_ENDPOINT=http://$keystone:35357/v2.0/
4198
24
export SERVICE_TOKEN=admin
4199
25
export OS_AUTH_URL=http://$keystone:35357/v2.0/
4200
26
export OS_USERNAME=admin
4201
27
export OS_PASSWORD=admin
4202
28
export OS_TENANT_NAME=admin
4203
29
export OS_REGION_NAME=RegionOne
4204
30
" > nova.rc
4205
31
4206
32
source nova.rc
4207
33
4208
34
# Determine the tenant id for the configured tenant name.
4209
35
export TENANT_ID="$(keystone tenant-list | grep $OS_TENANT_NAME | awk '{ print $2 }')"
4210
36
4211
37
#create ext network with neutron for floating IPs
4212
38
EXTERNAL_NETWORK_ID=$(neutron net-create ext_net --tenant-id $TENANT_ID -- --router:external=True | grep " id" | awk '{print $4}')
4213
39
neutron subnet-create ext_net $QUANTUM_EXT_NET_CIDR --name ext_net_subnet --tenant-id $TENANT_ID \
4214
40
--allocation-pool start=$QUANTUM_FLOAT_RANGE_START,end=$QUANTUM_FLOAT_RANGE_END \
4215
41
--gateway $QUANTUM_EXT_NET_GW --disable-dhcp --dns_nameservers $QUANTUM_DNS list=true
4216
42
4217
43
#Create private network for neutron for tenant VMs
4218
44
neutron net-create private
4219
45
SUBNET_ID=$(neutron subnet-create private $QUANTUM_FIXED_NET_CIDR -- --name private_subnet --dns_nameservers list=true $QUANTUM_DNS | grep " id" | awk '{print $4}')
4220
46
4221
47
#Create router for external network and private network
4222
48
ROUTER_ID=$(neutron router-create --tenant-id $TENANT_ID provider-router | grep " id" | awk '{print $4}')
4223
49
neutron router-interface-add $ROUTER_ID $SUBNET_ID
4224
50
neutron router-gateway-set $ROUTER_ID $EXTERNAL_NETWORK_ID
4225
51
4226
52
#Configure the default security group to allow ICMP and SSH
4227
53
nova  secgroup-add-rule default icmp -1 -1 0.0.0.0/0
4228
54
nova  secgroup-add-rule default tcp 22 22 0.0.0.0/0
4229
55
#for rdp
4230
56
nova secgroup-add-rule default tcp 3389 3389 0.0.0.0/0
4231
57
4232
58
#Upload a default SSH key
4233
59
nova  keypair-add --pub-key ~/.ssh/id_rsa.pub default
4234
60
4235
61
#Remove the m1.tiny as it is too small for Ubuntu.
4236
62
nova flavor-delete m1.tiny
4237
63
4238
64
#Upload images to glance
4239
65
glance add name="Precise x86_64" is_public=true container_format=ovf disk_format=qcow2 <  /srv/data/precise-server-cloudimg-amd64-disk1.img 
4240
66
glance add name="Trusty x86_64" is_public=true container_format=ovf disk_format=qcow2 <  /srv/data/trusty-server-cloudimg-amd64-disk1.img
4241
67
glance add name="CentOS 6.4" is_public=true container_format=bare disk_format=qcow2 < /srv/data/centos6.4-x86_64-gold-master.img
4242
68
glance add name="Cirros 0.3" is_public=true container_format=bare disk_format=qcow2 < /srv/data/cirros-0.3.2-x86_64-disk.img
4243
69
glance add name="Windows Server 2012" is_public=true container_format=bare disk_format=qcow2 < /srv/data/windows_server_2012_r2_standard_eval_kvm_20131117.qcow2
4244
70
4245
71
exit
4246
72
4247
73
0
4248
=== removed file 'usr/lib/orange-box/examples/openstack/icehouse/precise/04-deploy-jumpserver-and-juju.sh'
4249
--- usr/lib/orange-box/examples/openstack/icehouse/precise/04-deploy-jumpserver-and-juju.sh	2014-07-14 07:26:29 +0000
4250
+++ usr/lib/orange-box/examples/openstack/icehouse/precise/04-deploy-jumpserver-and-juju.sh	1970-01-01 00:00:00 +0000
4251
@@ -1,72 +0,0 @@
4252
1
#!/bin/bash
4253
2
4254
3
set -ex
4255
4
4256
5
echo "This command is run to launch the first instance on a new Orange box Openstack deployment"
4257
6
4258
7
source nova.rc
4259
8
4260
9
#Modify quotas for the tenant to allow large deployments
4261
10
TENANT=$(keystone tenant-list | grep $OS_TENANT_NAME | awk '{print $2}')
4262
11
nova quota-update --instances 50 $TENANT
4263
12
nova quota-update --cores 50 $TENANT
4264
13
nova quota-update --ram 102400 $TENANT
4265
14
nova quota-update --security-groups 50 $TENANT
4266
15
4267
16
#Create a floating IP for the instance
4268
17
FLOAT_IP="$(nova floating-ip-create | grep ext_net | awk '{ print $2}')"
4269
18
4270
19
#Launch an instance
4271
20
NET_UUID="$(nova net-list | grep private | awk '{ print $2 }')"
4272
21
IMAGE_UUID="$(nova image-list | grep Trusty | awk '{ print $2 }')"
4273
22
nova boot --flavor 2 --key_name default --image $IMAGE_UUID --nic net-id=$NET_UUID --security_group default jumpserver
4274
23
sleep 40
4275
24
4276
25
#Associate the floating IP with the new instance
4277
26
nova floating-ip-associate jumpserver $FLOAT_IP
4278
27
sleep 10
4279
28
#SSH into the instance and install Juju
4280
29
ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP sudo apt-get -y install juju-core juju-quickstart juju-deployer
4281
30
4282
31
#Set up the Juju default environment
4283
32
ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP juju init
4284
33
4285
34
#Output a juju env file that works on this cloud
4286
35
ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "echo 'default: openstack
4287
36
environments:
4288
37
    openstack:
4289
38
        type: openstack
4290
39
        network: private
4291
40
        auth-url: $OS_AUTH_URL
4292
41
        tenant-name: $OS_TENANT_NAME
4293
42
        region: $OS_REGION_NAME
4294
43
        auth-mode: userpass
4295
44
        username: $OS_USERNAME
4296
45
        password: $OS_PASSWORD
4297
46
        admin-secret: $OS_PASSWORD
4298
47
        default-series: precise
4299
48
' > ~/.juju/environments.yaml"
4300
49
4301
50
#Create juju metadata
4302
51
ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "juju-metadata generate-image -a amd64 -u $OS_AUTH_URL -i $IMAGE_UUID -r $OS_REGION_NAME -s trusty"
4303
52
4304
53
IMAGE_UUID="$(nova image-list | grep Precise | awk '{ print $2 }')"
4305
54
ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "juju-metadata generate-image -a amd64 -u $OS_AUTH_URL -i $IMAGE_UUID -r $OS_REGION_NAME -s precise"
4306
55
4307
56
#Bootstrap Juju
4308
57
ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "juju bootstrap --metadata-source=/home/ubuntu --upload-tools=true --series=precise,trusty"
4309
58
4310
59
#Deploy juju-gui
4311
60
ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "juju deploy --to 0 juju-gui && juju expose juju-gui"
4312
61
4313
62
#Create a new floating IP and associate with juju bootstrap instance
4314
63
INSTANCE_ID="$(nova list | grep juju-openstack-machine-0 | awk '{ print $2}')"
4315
64
FLOAT_IP2="$(nova floating-ip-create | grep ext_net | awk '{ print $2}')"
4316
65
nova floating-ip-associate $INSTANCE_ID $FLOAT_IP2
4317
66
4318
67
#Print the address of Juju-gui for deployments on Openstack
4319
68
echo "Now connect to the Juju-GUI at: http://$FLOAT_IP2/ to continue deployments on Openstack."
4320
69
echo "Pass: $OS_PASSWORD"
4321
70
4322
71
exit
4323
72
4324
73
0
4325
=== removed file 'usr/lib/orange-box/examples/openstack/icehouse/precise/99-cleanup.sh'
4326
--- usr/lib/orange-box/examples/openstack/icehouse/precise/99-cleanup.sh	2014-07-14 07:26:29 +0000
4327
+++ usr/lib/orange-box/examples/openstack/icehouse/precise/99-cleanup.sh	1970-01-01 00:00:00 +0000
4328
@@ -1,11 +0,0 @@
4329
1
#!/bin/bash
4330
2
4331
3
#Destroy everything
4332
4
juju destroy-environment maas-trusty
4333
5
echo "wait a bit for maas to do his job"
4334
6
sleep 45
4335
7
export AMT_PASSWORD=Password1+
4336
8
for i in $(seq 11 19); do
4337
9
	yes | amttool 10.14.4.$i powerdown >/dev/null 2>&1
4338
10
done
4339
11
4340
12
0
4341
=== modified file 'usr/lib/orange-box/examples/openstack/icehouse/precise/README'
4342
--- usr/lib/orange-box/examples/openstack/icehouse/precise/README	2014-07-14 07:26:29 +0000
4343
+++ usr/lib/orange-box/examples/openstack/icehouse/precise/README	2014-07-24 01:23:40 +0000
4344
@@ -1,10 +1,20 @@
4346
1
This demo will deploy Icehouse on 14.04
1
This demo will deploy Icehouse on 12.04
4347
2
By the end of the demo you will have a working Openstack,
2
By the end of the demo you will have a working Openstack,
4348
3
plus a working Openstack Juju environment and GUI to deploy further workloads to.
3
plus a working Openstack Juju environment and GUI to deploy further workloads to.
4355
4
Just run each script in order:
4
4356
5
00-bootstrap.sh - This will boostrap Juju on the MAAS provider
5
4357
6
01-deploy.sh - This will deploy Openstack on the Orange Box.
6
./01-deploy.sh - This will deploy Openstack on the Orange Box.
4358
7
02-configure-openstack.sh - This will configure openstack ready to launch instances
7
orange-box-configure-openstack - This will configure openstack ready to launch instances
4359
8
03-deploy-jumpserver-and-juju.sh - This will deploy a Jumpserver with a public IP for SSH access into the tenant private network, install Juju and create an Openstack Juju environment, bootstrap and launch the GUI and print the public IP of the GUI.
8
4360
9
99-cleanup.sh - This will destroy the Juju environment on the MAAS provider and make sure all NUC nodes are shut down.
9
orange-box-launch-openstack-juju - This will deploy a Jumpserver with a public IP for SSH access into the tenant private network, install Juju and create an Openstack Juju environment, bootstrap and launch the GUI and print the public IP of the GUI.
4361
10
4362
11
OPTIONAL:
4363
12
./deploy-instances.sh - This will deploy a number of instances to show the cloud working.
4364
13
4365
14
4366
15
automated deployment
4367
16
For testing purposes or an unattended deployment, you can use the script:
4368
17
./automated-deployment.sh
4369
18
which will run the deployment scripts from bootstrap to deploying the jumpserver and juju-gui.
4370
19
This takes about 30 minutes.
4371
10
20
4372
11
21
4373
=== added file 'usr/lib/orange-box/examples/openstack/icehouse/precise/automated-deploy.sh'
4374
--- usr/lib/orange-box/examples/openstack/icehouse/precise/automated-deploy.sh	1970-01-01 00:00:00 +0000
4375
+++ usr/lib/orange-box/examples/openstack/icehouse/precise/automated-deploy.sh	2014-07-24 01:23:40 +0000
4376
@@ -0,0 +1,26 @@
4377
1
#!/bin/bash
4378
2
#Canonical Micro-Cluster auto-deployment bootstrap to tenant juju-gui
4379
3
set -e #-x for debugging output
4380
4
4381
5
start=`date`
4382
6
orange-box-bootstrap-juju
4383
7
until (juju pprint | grep juju-gui | grep started) ; do
4384
8
             sleep 10
4385
9
         done
4386
10
./01-deploy.sh
4387
11
sleep 60
4388
12
orange-box-configure-openstack
4389
13
sleep 60
4390
14
source ~/nova.rc
4391
15
until (glance image-list | grep Precise | grep active) ; do
4392
16
             sleep 10
4393
17
         done
4394
18
until (glance image-list | grep Trusty | grep active) ; do
4395
19
             sleep 10
4396
20
         done
4397
21
orange-box-launch-openstack-juju
4398
22
end=`date`
4399
23
4400
24
echo "Deployment started: $start"
4401
25
echo "Deployment completed: $end"
4402
26
4403
0
27
4404
=== added file 'usr/lib/orange-box/examples/openstack/icehouse/precise/deploy-instances.sh'
4405
--- usr/lib/orange-box/examples/openstack/icehouse/precise/deploy-instances.sh	1970-01-01 00:00:00 +0000
4406
+++ usr/lib/orange-box/examples/openstack/icehouse/precise/deploy-instances.sh	2014-07-24 01:23:40 +0000
4407
@@ -0,0 +1,40 @@
4408
1
#!/bin/bash
4409
2
4410
3
#This script expects you to already have a nova.rc file in this directory.
4411
4
#your nova.rc can be created manually or downlaoded from horizon dashboard.
4412
5
#it should look like this:
4413
6
#export SERVICE_ENDPOINT=http://HOST:35357/v2.0/
4414
7
#export SERVICE_TOKEN=admin
4415
8
#export OS_AUTH_URL=http://HOST:35357/v2.0/
4416
9
#export OS_USERNAME=admin
4417
10
#export OS_PASSWORD=admin
4418
11
#export OS_TENANT_NAME=admin
4419
12
#export OS_REGION_NAME=RegionOne
4420
13
#Where HOST is your keystone host or IP address.
4421
14
4422
15
set -e
4423
16
4424
17
echo "This command is run to deploy any number of instance on a new Orange box Openstack deployment"
4425
18
4426
19
source nova.rc
4427
20
4428
21
#How many instances to start
4429
22
echo "How many machines should be deployed? (Default is 0, 0-48)"
4430
23
read -n 2 instances
4431
24
if [ "$instances" = "0"  ] ; then
4432
25
   echo "You selected 0 instances to deploy, exiting!"
4433
26
   exit
4434
27
fi
4435
28
4436
29
#Launch an instance
4437
30
NET_UUID="$(nova net-list | grep private | awk '{ print $2 }')"
4438
31
IMAGE_UUID="$(nova image-list | grep Trusty | awk '{ print $2 }')"
4439
32
for (( c=1; c<=$instances; c++ ))
4440
33
do
4441
34
	echo "Deploying test instance: $c"
4442
35
        nova boot --flavor 2 --key_name default --image $IMAGE_UUID --nic net-id=$NET_UUID --security_group default test-instance-$c
4443
36
done
4444
37
4445
38
exit
4446
39
4447
40
4448
0
41
4449
=== modified file 'usr/lib/orange-box/examples/openstack/icehouse/precise/icehouseOB.yaml'
4450
--- usr/lib/orange-box/examples/openstack/icehouse/precise/icehouseOB.yaml	2014-07-14 07:26:29 +0000
4451
+++ usr/lib/orange-box/examples/openstack/icehouse/precise/icehouseOB.yaml	2014-07-24 01:23:40 +0000
4452
@@ -4,7 +4,7 @@
4453
4
    source: "cloud:precise-updates/icehouse"
4
    source: "cloud:precise-updates/icehouse"
4454
5
  services:
5
  services:
4455
6
    ceph:
6
    ceph:
4457
7
      charm: "cs:precise/ceph"
7
      charm: "cs:precise/ceph-26"
4458
8
      num_units: 3
8
      num_units: 3
4459
9
      constraints: tags=physical
9
      constraints: tags=physical
4460
10
      options:
10
      options:
4461
@@ -12,107 +12,134 @@
4462
12
        "monitor-secret": AQAAvoJSOAv/NRAAgvXP8d7iXN7lWYbvDZzm2Q==
12
        "monitor-secret": AQAAvoJSOAv/NRAAgvXP8d7iXN7lWYbvDZzm2Q==
4463
13
        "osd-devices": "/srv"
13
        "osd-devices": "/srv"
4464
14
        "osd-reformat": "yes"
14
        "osd-reformat": "yes"
4469
15
    "ceph-radosgw": 
15
      annotations:
4470
16
      charm: "cs:precise/ceph-radosgw"
16
        "gui-x": "2648.6688842773438"
4471
17
      num_units: 1
17
        "gui-y": "708.3873901367188"
4468
18
      constraints: tags=physical
4472
19
    keystone: 
18
    keystone: 
4474
20
      charm: "cs:precise/keystone"
19
      charm: "cs:precise/keystone-37"
4475
21
      num_units: 1
20
      num_units: 1
4476
22
      constraints: tags=physical
21
      constraints: tags=physical
4477
23
      options: 
22
      options: 
4478
24
        "admin-password": "admin"
23
        "admin-password": "admin"
4479
25
        "admin-token": "admin"
24
        "admin-token": "admin"
4480
26
      annotations:
25
      annotations:
4483
27
        "gui-x": "1731.1756591796875"
26
        "gui-x": "2013.905517578125"
4484
28
        "gui-y": "59.8729248046875"
27
        "gui-y": "75.58013916015625"
4485
29
    "nova-compute":
28
    "nova-compute":
4487
30
      charm: "cs:precise/nova-compute"
29
      charm: "cs:precise/nova-compute-31"
4488
31
      num_units: 3
30
      num_units: 3
4489
32
      to: [ceph=0, ceph=1, ceph=2]
31
      to: [ceph=0, ceph=1, ceph=2]
4490
33
      options:
32
      options:
4491
34
        "flat-interface": eth0
33
        "flat-interface": eth0
4492
35
      annotations:
34
      annotations:
4495
36
        "gui-x": "1325.8563232421875"
35
        "gui-x": "776.1040649414062"
4496
37
        "gui-y": "-27.374825477600098"
36
        "gui-y": "-81.22811031341553"
4497
38
    "neutron-gateway":
37
    "neutron-gateway":
4499
39
      charm: "cs:precise/quantum-gateway"
38
      charm: "cs:precise/quantum-gateway-21"
4500
40
      num_units: 1
39
      num_units: 1
4501
41
      constraints: tags=neutron
40
      constraints: tags=neutron
4502
42
      options:
41
      options:
4503
43
        ext-port: eth1
42
        ext-port: eth1
4504
44
        instance-mtu: 1400
43
        instance-mtu: 1400
4505
45
      annotations:
44
      annotations:
4508
46
        "gui-x": "847.3951416015625"
45
        "gui-x": "329.0572509765625"
4509
47
        "gui-y": "432.41436767578125"
46
        "gui-y": "46.4658203125"
4510
48
    "nova-cloud-controller": 
47
    "nova-cloud-controller": 
4512
49
      charm: "cs:precise/nova-cloud-controller"
48
      charm: "cs:precise/nova-cloud-controller-41"
4513
50
      num_units: 1
49
      num_units: 1
4514
51
      constraints: tags=physical
50
      constraints: tags=physical
4515
52
      options: 
51
      options: 
4516
53
        "network-manager": Neutron
52
        "network-manager": Neutron
4517
54
      annotations:
53
      annotations:
4520
55
        "gui-x": "1401.865234375"
54
        "gui-x": "1388.40185546875"
4521
56
        "gui-y": "891.737548828125"
55
        "gui-y": "-118.01156234741211"
4522
57
    rabbitmq: 
56
    rabbitmq: 
4524
58
      charm: "cs:precise/rabbitmq-server"
57
      charm: "cs:precise/rabbitmq-server-28"
4525
59
      num_units: 1
58
      num_units: 1
4527
60
      to: 0
59
      to: mysql
4528
61
      annotations:
60
      annotations:
4531
62
        "gui-x": "2000.339111328125"
61
        "gui-x": "633.8120727539062"
4532
63
        "gui-y": "420.60723876953125"
62
        "gui-y": "862.6530151367188"
4533
64
    glance: 
63
    glance: 
4535
65
      charm: "cs:precise/glance"
64
      charm: "cs:precise/glance-34"
4536
66
      num_units: 1
65
      num_units: 1
4537
67
      to: nova-cloud-controller
66
      to: nova-cloud-controller
4538
68
      annotations:
67
      annotations:
4541
69
        "gui-x": "1008.2059936523438"
68
        "gui-x": "1147.3269653320312"
4542
70
        "gui-y": "734.3492889404297"
69
        "gui-y": "1389.5643157958984"
4543
71
    cinder: 
70
    cinder: 
4545
72
      charm: "cs:precise/cinder"
71
      charm: "cs:precise/cinder-26"
4546
73
      num_units: 1
72
      num_units: 1
4547
74
      to: nova-cloud-controller
73
      to: nova-cloud-controller
4548
75
      options: 
74
      options: 
4549
76
        "block-device": none
75
        "block-device": none
4550
77
      annotations:
76
      annotations:
4553
78
        "gui-x": "980.4285888671875"
77
        "gui-x": "1752.32568359375"
4554
79
        "gui-y": "154.0172348022461"
78
        "gui-y": "1365.716194152832"
4555
80
    "ceph-radosgw":
79
    "ceph-radosgw":
4557
81
      charm: "cs:precise/ceph-radosgw"
80
      charm: "cs:precise/ceph-radosgw-12"
4558
82
      num_units: 1
81
      num_units: 1
4559
83
      to: nova-cloud-controller
82
      to: nova-cloud-controller
4560
83
      annotations:
4561
84
        "gui-x": "2216.68212890625"
4562
85
        "gui-y": "697.16796875"
4563
84
    cinder-ceph:
86
    cinder-ceph:
4565
85
      charm: "cs:precise/cinder-ceph"
87
      charm: "cs:precise/cinder-ceph-1"
4566
88
      num_units: 0
4567
89
      annotations:
4568
90
        "gui-x": "2257.5515747070312"
4569
91
        "gui-y": "1231.2130126953125"
4570
86
    "openstack-dashboard": 
92
    "openstack-dashboard": 
4572
87
      charm: "cs:precise/openstack-dashboard"
93
      charm: "cs:precise/openstack-dashboard-20"
4573
88
      num_units: 1
94
      num_units: 1
4574
89
      to: "keystone"
95
      to: "keystone"
4575
96
      options:
4576
97
        webroot: "/"
4577
90
      annotations:
98
      annotations:
4580
91
        "gui-x": "2023.8385009765625"
99
        "gui-x": "2353.6898193359375"
4581
92
        "gui-y": "65.05170631408691"
100
        "gui-y": "-94.2642593383789"
4582
93
    mysql: 
101
    mysql: 
4584
94
      charm: "cs:precise/mysql"
102
      charm: "cs:precise/mysql-46"
4585
95
      num_units: 1
103
      num_units: 1
4587
96
      to: 0
104
      constraints: tags=physical
4588
97
      options:
105
      options:
4589
98
        "dataset-size": "20%"
106
        "dataset-size": "20%"
4590
99
      annotations:
107
      annotations:
4593
100
        "gui-x": "1912.73876953125"
108
        "gui-x": "364.4567565917969"
4594
101
        "gui-y": "762.34814453125"
109
        "gui-y": "1067.5167846679688"
4595
102
    mongodb:
110
    mongodb:
4597
103
      charm: "cs:precise/mongodb"
111
      charm: "cs:precise/mongodb-29"
4598
104
      num_units: 1
112
      num_units: 1
4599
105
      constraints: tags=physical
113
      constraints: tags=physical
4600
114
      annotations:
4601
115
        "gui-x": "-70.0399979352951"
4602
116
        "gui-y": "1282.8224487304688"
4603
106
    ceilometer:
117
    ceilometer:
4605
107
      charm: "cs:precise/ceilometer"
118
      charm: "cs:precise/ceilometer-20"
4606
108
      num_units: 1
119
      num_units: 1
4607
109
      to: mongodb
120
      to: mongodb
4608
121
      annotations:
4609
122
        "gui-x": "-78.13333225250244"
4610
123
        "gui-y": "919.3128051757812"
4611
110
    ceilometer-agent:
124
    ceilometer-agent:
4613
111
      charm: "cs:precise/ceilometer-agent"
125
      charm: "cs:precise/ceilometer-agent-18"
4614
126
      num_units: 0
4615
127
      annotations:
4616
128
        "gui-x": "-90.9158582687378"
4617
129
        "gui-y": "562.5347595214844"
4618
112
    heat:
130
    heat:
4620
113
      charm: "cs:precise/heat"
131
      charm: "cs:precise/heat-3"
4621
114
      num_units: 1
132
      num_units: 1
4622
115
      to: mongodb
133
      to: mongodb
4623
134
      annotations:
4624
135
        "gui-x": "494.94012451171875"
4625
136
        "gui-y": "1363.6024169921875"
4626
137
    ntp:
4627
138
      charm: "cs:precise/ntp-3"
4628
139
      num_units: 0
4629
140
      annotations:
4630
141
        "gui-x": "-104.57728099822998"
4631
142
        "gui-y": "294.6641273498535"
4632
116
  relations: 
143
  relations: 
4633
117
    - - "keystone:shared-db"
144
    - - "keystone:shared-db"
4634
118
      - "mysql:shared-db"
145
      - "mysql:shared-db"
4635
@@ -180,5 +207,33 @@
4636
180
      - "ceph:radosgw"
207
      - "ceph:radosgw"
4637
181
    - - "ceph-radosgw:identity-service"
208
    - - "ceph-radosgw:identity-service"
4638
182
      - "keystone:identity-service"
209
      - "keystone:identity-service"
4639
210
    - - "ntp:juju-info"
4640
211
      - "neutron-gateway:juju-info"
4641
212
    - - "ntp:juju-info"
4642
213
      - "ceph:juju-info"
4643
214
    - - "ntp:juju-info"
4644
215
      - "keystone:juju-info"
4645
216
    - - "ntp:juju-info"
4646
217
      - "nova-compute:juju-info"
4647
218
    - - "ntp:juju-info"
4648
219
      - "nova-cloud-controller:juju-info"
4649
220
    - - "ntp:juju-info"
4650
221
      - "rabbitmq:juju-info"
4651
222
    - - "ntp:juju-info"
4652
223
      - "glance:juju-info"
4653
224
    - - "ntp:juju-info"
4654
225
      - "cinder:juju-info"
4655
226
    - - "ntp:juju-info"
4656
227
      - "ceph-radosgw:juju-info"
4657
228
    - - "ntp:juju-info"
4658
229
      - "openstack-dashboard:juju-info"
4659
230
    - - "ntp:juju-info"
4660
231
      - "mysql:juju-info"
4661
232
    - - "ntp:juju-info"
4662
233
      - "mongodb:juju-info"
4663
234
    - - "ntp:juju-info"
4664
235
      - "ceilometer:juju-info"
4665
236
    - - "ntp:juju-info"
4666
237
      - "heat:juju-info"
4667
183
  series: precise
238
  series: precise
4668
184
239
4669
185
240
4670
=== removed file 'usr/lib/orange-box/examples/openstack/icehouse/trusty/00-bootstrap.sh'
4671
--- usr/lib/orange-box/examples/openstack/icehouse/trusty/00-bootstrap.sh	2014-07-14 07:26:29 +0000
4672
+++ usr/lib/orange-box/examples/openstack/icehouse/trusty/00-bootstrap.sh	1970-01-01 00:00:00 +0000
4673
@@ -1,18 +0,0 @@
4674
1
#!/bin/bash
4675
2
#Canonical Micro-Cluster Demo Preparation
4676
3
echo "checking for existing Juju environment..."
4677
4
juju status && echo "Existing deployment found, exiting." && exit
4678
5
4679
6
rm ~/.ssh/known_hosts
4680
7
4681
8
juju env maas-trusty
4682
9
4683
10
echo "Deploying Juju Bootstrap node to Virtual machine: juju.local using tags=juju"
4684
11
juju bootstrap --upload-tools=true --constraints "tags=bootstrap" --show-log --series=precise,trusty
4685
12
4686
13
echo "unset constraints"
4687
14
juju set-constraints tags=""
4688
15
echo "Deploying Juju-gui to bootstrap node"
4689
16
juju deploy --to 0 juju-gui
4690
17
juju expose juju-gui
4691
18
4692
19
0
4693
=== modified file 'usr/lib/orange-box/examples/openstack/icehouse/trusty/01-deploy.sh'
4694
--- usr/lib/orange-box/examples/openstack/icehouse/trusty/01-deploy.sh	2014-07-14 07:26:29 +0000
4695
+++ usr/lib/orange-box/examples/openstack/icehouse/trusty/01-deploy.sh	2014-07-24 01:23:40 +0000
4696
@@ -4,7 +4,7 @@
4697
4
set -ex
4
set -ex
4698
5
5
4699
6
juju set-constraints tags=
6
juju set-constraints tags=
4701
7
juju-deployer -e maas-trusty -c  icehouseOB.yaml
7
juju-deployer -c  icehouseOB.yaml
4702
8
8
4703
9
9
4704
10
echo "Deployment finished"
10
echo "Deployment finished"
4705
11
11
4706
=== removed file 'usr/lib/orange-box/examples/openstack/icehouse/trusty/02-configure-openstack.sh'
4707
--- usr/lib/orange-box/examples/openstack/icehouse/trusty/02-configure-openstack.sh	2014-07-14 07:26:29 +0000
4708
+++ usr/lib/orange-box/examples/openstack/icehouse/trusty/02-configure-openstack.sh	1970-01-01 00:00:00 +0000
4709
@@ -1,72 +0,0 @@
4710
1
#!/bin/bash
4711
2
4712
3
set -e
4713
4
4714
5
echo "This command is run to configure an Orange-Box Openstack deployment"
4715
6
4716
7
### assume you ran this :  sudo apt-get install python-keystone python-novaclient zile python-neutron python-glanceclient
4717
8
unset http_proxy 
4718
9
unset https_proxy
4719
10
4720
11
QUANTUM_EXT_NET_GW="10.14.4.1"
4721
12
QUANTUM_EXT_NET_CIDR="10.14.4.0/24"
4722
13
QUANTUM_EXT_NET_NAME="ext_net"
4723
14
QUANTUM_DNS="10.14.4.1"
4724
15
QUANTUM_FLOAT_RANGE_START="10.14.4.20"
4725
16
QUANTUM_FLOAT_RANGE_END="10.14.4.49"
4726
17
4727
18
QUANTUM_FIXED_NET_CIDR="192.168.14.0/24"
4728
19
QUANTUM_FIXED_NET_NAME="admin_net"
4729
20
4730
21
keystone=$(juju status keystone | grep public-address | head -1 | awk '{print $2}')
4731
22
4732
23
echo "export SERVICE_ENDPOINT=http://$keystone:35357/v2.0/
4733
24
export SERVICE_TOKEN=admin
4734
25
export OS_AUTH_URL=http://$keystone:35357/v2.0/
4735
26
export OS_USERNAME=admin
4736
27
export OS_PASSWORD=admin
4737
28
export OS_TENANT_NAME=admin
4738
29
export OS_REGION_NAME=RegionOne
4739
30
" > nova.rc
4740
31
4741
32
source nova.rc
4742
33
4743
34
# Determine the tenant id for the configured tenant name.
4744
35
export TENANT_ID="$(keystone tenant-list | grep $OS_TENANT_NAME | awk '{ print $2 }')"
4745
36
4746
37
#create ext network with neutron for floating IPs
4747
38
EXTERNAL_NETWORK_ID=$(neutron net-create ext_net --tenant-id $TENANT_ID -- --router:external=True | grep " id" | awk '{print $4}')
4748
39
neutron subnet-create ext_net $QUANTUM_EXT_NET_CIDR --name ext_net_subnet --tenant-id $TENANT_ID \
4749
40
--allocation-pool start=$QUANTUM_FLOAT_RANGE_START,end=$QUANTUM_FLOAT_RANGE_END \
4750
41
--gateway $QUANTUM_EXT_NET_GW --disable-dhcp --dns_nameservers $QUANTUM_DNS list=true
4751
42
4752
43
#Create private network for neutron for tenant VMs
4753
44
neutron net-create private
4754
45
SUBNET_ID=$(neutron subnet-create private $QUANTUM_FIXED_NET_CIDR -- --name private_subnet --dns_nameservers list=true $QUANTUM_DNS | grep " id" | awk '{print $4}')
4755
46
4756
47
#Create router for external network and private network
4757
48
ROUTER_ID=$(neutron router-create --tenant-id $TENANT_ID provider-router | grep " id" | awk '{print $4}')
4758
49
neutron router-interface-add $ROUTER_ID $SUBNET_ID
4759
50
neutron router-gateway-set $ROUTER_ID $EXTERNAL_NETWORK_ID
4760
51
4761
52
#Configure the default security group to allow ICMP and SSH
4762
53
nova  secgroup-add-rule default icmp -1 -1 0.0.0.0/0
4763
54
nova  secgroup-add-rule default tcp 22 22 0.0.0.0/0
4764
55
#for rdp
4765
56
nova secgroup-add-rule default tcp 3389 3389 0.0.0.0/0
4766
57
4767
58
#Upload a default SSH key
4768
59
nova  keypair-add --pub-key ~/.ssh/id_rsa.pub default
4769
60
4770
61
#Remove the m1.tiny as it is too small for Ubuntu.
4771
62
nova flavor-delete m1.tiny
4772
63
4773
64
#Upload images to glance
4774
65
glance add name="Precise x86_64" is_public=true container_format=ovf disk_format=qcow2 <  /srv/data/precise-server-cloudimg-amd64-disk1.img 
4775
66
glance add name="Trusty x86_64" is_public=true container_format=ovf disk_format=qcow2 <  /srv/data/trusty-server-cloudimg-amd64-disk1.img
4776
67
glance add name="CentOS 6.4" is_public=true container_format=bare disk_format=qcow2 < /srv/data/centos6.4-x86_64-gold-master.img
4777
68
glance add name="Cirros 0.3" is_public=true container_format=bare disk_format=qcow2 < /srv/data/cirros-0.3.2-x86_64-disk.img
4778
69
glance add name="Windows Server 2012" is_public=true container_format=bare disk_format=qcow2 < /srv/data/windows_server_2012_r2_standard_eval_kvm_20131117.qcow2
4779
70
4780
71
exit
4781
72
4782
73
0
4783
=== removed file 'usr/lib/orange-box/examples/openstack/icehouse/trusty/04-deploy-jumpserver-and-juju.sh'
4784
--- usr/lib/orange-box/examples/openstack/icehouse/trusty/04-deploy-jumpserver-and-juju.sh	2014-07-14 07:26:29 +0000
4785
+++ usr/lib/orange-box/examples/openstack/icehouse/trusty/04-deploy-jumpserver-and-juju.sh	1970-01-01 00:00:00 +0000
4786
@@ -1,77 +0,0 @@
4787
1
#!/bin/bash
4788
2
4789
3
set -ex
4790
4
4791
5
echo "This command is run to launch the first instance on a new Orange box Openstack deployment"
4792
6
4793
7
source nova.rc
4794
8
4795
9
#Modify quotas for the tenant to allow large deployments
4796
10
TENANT=$(keystone tenant-list | grep $OS_TENANT_NAME | awk '{print $2}')
4797
11
nova quota-update --instances 50 $TENANT
4798
12
nova quota-update --cores 50 $TENANT
4799
13
nova quota-update --ram 102400 $TENANT
4800
14
nova quota-update --security-groups 50 $TENANT
4801
15
4802
16
#Create a floating IP for the instance
4803
17
FLOAT_IP="$(nova floating-ip-create | grep ext_net | awk '{ print $2}')"
4804
18
4805
19
#Launch an instance
4806
20
NET_UUID="$(nova net-list | grep private | awk '{ print $2 }')"
4807
21
IMAGE_UUID="$(nova image-list | grep Trusty | awk '{ print $2 }')"
4808
22
nova boot --flavor 2 --key_name default --image $IMAGE_UUID --nic net-id=$NET_UUID --security_group default jumpserver
4809
23
sleep 40
4810
24
4811
25
#Associate the floating IP with the new instance
4812
26
nova floating-ip-associate jumpserver $FLOAT_IP
4813
27
sleep 10
4814
28
#SSH into the instance and install Juju
4815
29
ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP sudo apt-get -y install juju-core juju-quickstart juju-deployer
4816
30
4817
31
#Set up the Juju default environment
4818
32
ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP juju init
4819
33
4820
34
#Output a juju env file that works on this cloud
4821
35
ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "echo 'default: openstack
4822
36
environments:
4823
37
    openstack:
4824
38
        type: openstack
4825
39
        network: private
4826
40
        auth-url: $OS_AUTH_URL
4827
41
        tenant-name: $OS_TENANT_NAME
4828
42
        region: $OS_REGION_NAME
4829
43
        auth-mode: userpass
4830
44
        username: $OS_USERNAME
4831
45
        password: $OS_PASSWORD
4832
46
        admin-secret: $OS_PASSWORD
4833
47
        default-series: trusty
4834
48
' > ~/.juju/environments.yaml"
4835
49
4836
50
#Create juju metadata
4837
51
ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "juju-metadata generate-image -a amd64 -u $OS_AUTH_URL -i $IMAGE_UUID -r $OS_REGION_NAME -s trusty"
4838
52
4839
53
IMAGE_UUID="$(nova image-list | grep Precise | awk '{ print $2 }')"
4840
54
ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "juju-metadata generate-image -a amd64 -u $OS_AUTH_URL -i $IMAGE_UUID -r $OS_REGION_NAME -s precise"
4841
55
4842
56
#Bootstrap Juju
4843
57
ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "juju bootstrap --metadata-source=/home/ubuntu --upload-tools=true --series=precise,trusty"
4844
58
4845
59
#Deploy juju-gui
4846
60
ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "juju deploy --to 0 juju-gui && juju expose juju-gui"
4847
61
4848
62
#Install the Orange-box-examples package
4849
63
ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "sudo apt-add-repository ppa:orange-box-examples/ppa && sudo apt-get update && sudo apt-get install -y orange-box-examples"
4850
64
4851
65
#Create a new floating IP and associate with juju bootstrap instance
4852
66
INSTANCE_ID="$(nova list | grep juju-openstack-machine-0 | awk '{ print $2}')"
4853
67
FLOAT_IP2="$(nova floating-ip-create | grep ext_net | awk '{ print $2}')"
4854
68
nova floating-ip-associate $INSTANCE_ID $FLOAT_IP2
4855
69
4856
70
#Print the address of Juju-gui for deployments on Openstack
4857
71
echo "Now connect to the Juju-GUI at: http://$FLOAT_IP2/ to continue deployments on Openstack."
4858
72
echo "Pass: $OS_PASSWORD"
4859
73
4860
74
echo "OR Log in to openstack Jumpserver to deploy from command line"
4861
75
echo "ssh ubuntu@$FLOAT_IP"
4862
76
exit
4863
77
4864
78
0
4865
=== removed file 'usr/lib/orange-box/examples/openstack/icehouse/trusty/99-cleanup.sh'
4866
--- usr/lib/orange-box/examples/openstack/icehouse/trusty/99-cleanup.sh	2014-07-14 07:26:29 +0000
4867
+++ usr/lib/orange-box/examples/openstack/icehouse/trusty/99-cleanup.sh	1970-01-01 00:00:00 +0000
4868
@@ -1,11 +0,0 @@
4869
1
#!/bin/bash
4870
2
4871
3
#Destroy everything
4872
4
juju destroy-environment maas-trusty
4873
5
echo "wait a bit for maas to do his job"
4874
6
sleep 45
4875
7
export AMT_PASSWORD=Password1+
4876
8
for i in $(seq 11 19); do
4877
9
	yes | amttool 10.14.4.$i powerdown >/dev/null 2>&1
4878
10
done
4879
11
4880
12
0
4881
=== modified file 'usr/lib/orange-box/examples/openstack/icehouse/trusty/README'
4882
--- usr/lib/orange-box/examples/openstack/icehouse/trusty/README	2014-07-14 07:26:29 +0000
4883
+++ usr/lib/orange-box/examples/openstack/icehouse/trusty/README	2014-07-24 01:23:40 +0000
4884
@@ -1,10 +1,20 @@
4885
1
This demo will deploy Icehouse on 14.04
1
This demo will deploy Icehouse on 14.04
4886
2
By the end of the demo you will have a working Openstack,
2
By the end of the demo you will have a working Openstack,
4887
3
plus a working Openstack Juju environment and GUI to deploy further workloads to.
3
plus a working Openstack Juju environment and GUI to deploy further workloads to.
4888
4
4889
4
Just run each script in order:
5
Just run each script in order:
4895
5
00-bootstrap.sh - This will boostrap Juju on the MAAS provider
6
./01-deploy.sh - This will deploy Openstack on the Orange Box.
4896
6
01-deploy.sh - This will deploy Openstack on the Orange Box.
7
orange-box-configure-openstack - This will configure openstack ready to launch instances
4897
7
02-configure-openstack.sh - This will configure openstack ready to launch instances
8
4898
8
03-deploy-jumpserver-and-juju.sh - This will deploy a Jumpserver with a public IP for SSH access into the tenant private network, install Juju and create an Openstack Juju environment, bootstrap and launch the GUI and print the public IP of the GUI.
9
orange-box-launch-openstack-juju - This will deploy a Jumpserver with a public IP for SSH access into the tenant private network, install Juju and create an Openstack Juju environment, bootstrap and launch the GUI and print the public IP of the GUI.
4899
9
99-cleanup.sh - This will destroy the Juju environment on the MAAS provider and make sure all NUC nodes are shut down.
10
4900
11
OPTIONAL:
4901
12
./deploy-instances.sh - This will deploy a number of instances to show the cloud working.
4902
13
4903
14
4904
15
automated deployment
4905
16
For testing purposes or an unattended deployment, you can use the script:
4906
17
./automated-deployment.sh
4907
18
which will run the deployment scripts from bootstrap to deploying the jumpserver and juju-gui.
4908
19
This takes about 30 minutes.
4909
10
20
4910
11
21
4911
=== added file 'usr/lib/orange-box/examples/openstack/icehouse/trusty/automated-deploy.sh'
4912
--- usr/lib/orange-box/examples/openstack/icehouse/trusty/automated-deploy.sh	1970-01-01 00:00:00 +0000
4913
+++ usr/lib/orange-box/examples/openstack/icehouse/trusty/automated-deploy.sh	2014-07-24 01:23:40 +0000
4914
@@ -0,0 +1,26 @@
4915
1
#!/bin/bash
4916
2
#Canonical Micro-Cluster auto-deployment bootstrap to tenant juju-gui
4917
3
set -e #-x for debugging output
4918
4
4919
5
start=`date`
4920
6
orange-box-bootstrap-juju trusty
4921
7
until (juju pprint | grep juju-gui | grep started) ; do
4922
8
             sleep 10
4923
9
         done
4924
10
./01-deploy.sh
4925
11
sleep 60
4926
12
orange-box-configure-openstack
4927
13
sleep 60
4928
14
source ~/nova.rc
4929
15
until (glance image-list | grep Precise | grep active) ; do
4930
16
             sleep 10
4931
17
         done
4932
18
until (glance image-list | grep Trusty | grep active) ; do
4933
19
             sleep 10
4934
20
         done
4935
21
orange-box-launch-openstack-juju
4936
22
end=`date`
4937
23
4938
24
echo "Deployment started: $start"
4939
25
echo "Deployment completed: $end"
4940
26
4941
0
27
4942
=== added file 'usr/lib/orange-box/examples/openstack/icehouse/trusty/deploy-instances.sh'
4943
--- usr/lib/orange-box/examples/openstack/icehouse/trusty/deploy-instances.sh	1970-01-01 00:00:00 +0000
4944
+++ usr/lib/orange-box/examples/openstack/icehouse/trusty/deploy-instances.sh	2014-07-24 01:23:40 +0000
4945
@@ -0,0 +1,40 @@
4946
1
#!/bin/bash
4947
2
4948
3
#This script expects you to already have a nova.rc file in this directory.
4949
4
#your nova.rc can be created manually or downlaoded from horizon dashboard.
4950
5
#it should look like this:
4951
6
#export SERVICE_ENDPOINT=http://HOST:35357/v2.0/
4952
7
#export SERVICE_TOKEN=admin
4953
8
#export OS_AUTH_URL=http://HOST:35357/v2.0/
4954
9
#export OS_USERNAME=admin
4955
10
#export OS_PASSWORD=admin
4956
11
#export OS_TENANT_NAME=admin
4957
12
#export OS_REGION_NAME=RegionOne
4958
13
#Where HOST is your keystone host or IP address.
4959
14
4960
15
set -e
4961
16
4962
17
echo "This command is run to deploy any number of instance on a new Orange box Openstack deployment"
4963
18
4964
19
source nova.rc
4965
20
4966
21
#How many instances to start
4967
22
echo "How many machines should be deployed?"
4968
23
read -n 2 instances
4969
24
if [ "$instances" = "0"  ] ; then
4970
25
   echo "You selected 0 instances to deploy, exiting!"
4971
26
   exit
4972
27
fi
4973
28
4974
29
#Launch an instance
4975
30
NET_UUID="$(nova net-list | grep private | awk '{ print $2 }')"
4976
31
IMAGE_UUID="$(nova image-list | grep Trusty | awk '{ print $2 }')"
4977
32
for (( c=1; c<=$instances; c++ ))
4978
33
do
4979
34
	echo "Deploying test instance: $c"
4980
35
        nova boot --flavor 2 --key_name default --image $IMAGE_UUID --nic net-id=$NET_UUID --security_group default test-instance-$c
4981
36
done
4982
37
4983
38
exit
4984
39
4985
40
4986
0
41
4987
=== modified file 'usr/lib/orange-box/examples/openstack/icehouse/trusty/icehouseOB.yaml'
4988
--- usr/lib/orange-box/examples/openstack/icehouse/trusty/icehouseOB.yaml	2014-07-14 07:26:29 +0000
4989
+++ usr/lib/orange-box/examples/openstack/icehouse/trusty/icehouseOB.yaml	2014-07-24 01:23:40 +0000
4990
@@ -1,10 +1,10 @@
4991
1
icehouse:
1
icehouse:
4992
2
  overrides:
2
  overrides:
4995
3
    openstack-origin: distro
3
    openstack-origin: "cloud:trusty-icehouse"
4996
4
    source: distro
4
    source: "distro"
4997
5
  services:
5
  services:
4998
6
    ceph:
6
    ceph:
5000
7
      charm: "cs:trusty/ceph"
7
      charm: "cs:trusty/ceph-27"
Status:	Merged
Merged at revision:	17
Proposed branch:	lp:~dweaver/orange-box-examples/orange-box-examples
Merge into:	lp:~kirkland/orange-box-examples/trunk
Diff against target:	8764 lines (+3955/-3876) 123 files modified usr/lib/orange-box/examples/00-bootstrap.sh (+3/-10) usr/lib/orange-box/examples/99-cleanup.sh (+4/-0) usr/lib/orange-box/examples/README (+9/-0) usr/lib/orange-box/examples/app-bundles/owncloud/owncloud-bundle.yaml (+0/-47) usr/lib/orange-box/examples/hadoop/00-bootstrap.sh (+0/-16) usr/lib/orange-box/examples/hadoop/01-deploy.sh (+10/-0) usr/lib/orange-box/examples/hadoop/01-get-juju-gui-info.sh (+0/-6) usr/lib/orange-box/examples/hadoop/02-hadoop.yaml (+0/-44) usr/lib/orange-box/examples/hadoop/02-run-terasort.sh (+2/-0) usr/lib/orange-box/examples/hadoop/03-hive-demo.txt (+9/-0) usr/lib/orange-box/examples/hadoop/03-run-terasort.sh (+0/-2) usr/lib/orange-box/examples/hadoop/04-hive-demo.txt (+0/-9) usr/lib/orange-box/examples/hadoop/README (+11/-0) usr/lib/orange-box/examples/hadoop/demo.sh (+0/-33) usr/lib/orange-box/examples/hadoop/hadoop.yaml (+44/-0) usr/lib/orange-box/examples/infrastructure/precise/01-deploy.sh (+13/-0) usr/lib/orange-box/examples/infrastructure/precise/infrastructure-bundle.yaml (+42/-0) usr/lib/orange-box/examples/infrastructure/trusty/01-deploy.sh (+13/-0) usr/lib/orange-box/examples/infrastructure/trusty/infrastructure-bundle.yaml (+42/-0) usr/lib/orange-box/examples/landscape/01-deploy.sh (+20/-0) usr/lib/orange-box/examples/landscape/README (+56/-0) usr/lib/orange-box/examples/landscape/landscape-deployments-ob.yaml (+91/-0) usr/lib/orange-box/examples/openstack/complex/README (+0/-26) usr/lib/orange-box/examples/openstack/complex/bridge2.xml (+0/-11) usr/lib/orange-box/examples/openstack/complex/havana-colo/bundle.yaml (+0/-214) usr/lib/orange-box/examples/openstack/complex/havana-compute/03configure-cloud.sh (+0/-14) usr/lib/orange-box/examples/openstack/complex/havana-compute/bundle.yaml (+0/-164) usr/lib/orange-box/examples/openstack/complex/havana-swift/bundle.yaml (+0/-196) usr/lib/orange-box/examples/openstack/complex/havana/01demo-prep.sh (+0/-13) usr/lib/orange-box/examples/openstack/complex/havana/02deploy.sh (+0/-31) usr/lib/orange-box/examples/openstack/complex/havana/03configure-cloud.sh (+0/-17) usr/lib/orange-box/examples/openstack/complex/havana/04cleanup.sh (+0/-30) usr/lib/orange-box/examples/openstack/complex/havana/README (+0/-6) usr/lib/orange-box/examples/openstack/complex/havana/bundle.yaml (+0/-214) usr/lib/orange-box/examples/openstack/complex/juju-config/environments.yaml (+0/-13) usr/lib/orange-box/examples/openstack/complex/juju-config/generate-jujuenv (+0/-37) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/README (+0/-21) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/configure-tests (+0/-6) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/configure_tests.py (+0/-60) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/config.py (+0/-103) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_devstack_exercises.py (+0/-105) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/cloud.py (+0/-351) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/config.py (+0/-46) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/juju/client.py (+0/-190) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/juju/juju_deployer.py (+0/-186) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/all_variables (+0/-31) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack.conf (+0/-11) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/exerciserc (+0/-32) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.master (+0/-110) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.stable_essex (+0/-100) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.stable_folsom (+0/-110) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.stable_havana (+0/-112) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/openstack.conf (+0/-26) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/get-cloud-images (+0/-4) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/inspect-environment (+0/-187) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare-cloud (+0/-57) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare_cloud/folsom (+0/-147) usr/lib/orange-box/examples/openstack/complex/openstack-configuration/verify-cloud (+0/-6) usr/lib/orange-box/examples/openstack/complex/openstack-prereqs-install.sh (+0/-183) usr/lib/orange-box/examples/openstack/complex/remove-kvms.sh (+0/-53) usr/lib/orange-box/examples/openstack/havana/99-cleanup.sh (+0/-8) usr/lib/orange-box/examples/openstack/icehouse/precise/00-bootstrap.sh (+0/-18) usr/lib/orange-box/examples/openstack/icehouse/precise/01-deploy.sh (+1/-1) usr/lib/orange-box/examples/openstack/icehouse/precise/02-configure-openstack.sh (+0/-72) usr/lib/orange-box/examples/openstack/icehouse/precise/04-deploy-jumpserver-and-juju.sh (+0/-72) usr/lib/orange-box/examples/openstack/icehouse/precise/99-cleanup.sh (+0/-11) usr/lib/orange-box/examples/openstack/icehouse/precise/README (+17/-7) usr/lib/orange-box/examples/openstack/icehouse/precise/automated-deploy.sh (+26/-0) usr/lib/orange-box/examples/openstack/icehouse/precise/deploy-instances.sh (+40/-0) usr/lib/orange-box/examples/openstack/icehouse/precise/icehouseOB.yaml (+95/-40) usr/lib/orange-box/examples/openstack/icehouse/trusty/00-bootstrap.sh (+0/-18) usr/lib/orange-box/examples/openstack/icehouse/trusty/01-deploy.sh (+1/-1) usr/lib/orange-box/examples/openstack/icehouse/trusty/02-configure-openstack.sh (+0/-72) usr/lib/orange-box/examples/openstack/icehouse/trusty/04-deploy-jumpserver-and-juju.sh (+0/-77) usr/lib/orange-box/examples/openstack/icehouse/trusty/99-cleanup.sh (+0/-11) usr/lib/orange-box/examples/openstack/icehouse/trusty/README (+15/-5) usr/lib/orange-box/examples/openstack/icehouse/trusty/automated-deploy.sh (+26/-0) usr/lib/orange-box/examples/openstack/icehouse/trusty/deploy-instances.sh (+40/-0) usr/lib/orange-box/examples/openstack/icehouse/trusty/icehouseOB.yaml (+96/-41) usr/lib/orange-box/examples/openstack/icehouse/trusty/nova.rc (+0/-8) usr/lib/orange-box/examples/openstack/old-demos/README (+26/-0) usr/lib/orange-box/examples/openstack/old-demos/SUPERCEDED_USE_ICEHOUSE (+2/-0) usr/lib/orange-box/examples/openstack/old-demos/bridge2.xml (+11/-0) usr/lib/orange-box/examples/openstack/old-demos/havana-colo/bundle.yaml (+214/-0) usr/lib/orange-box/examples/openstack/old-demos/havana-compute/03configure-cloud.sh (+14/-0) usr/lib/orange-box/examples/openstack/old-demos/havana-compute/bundle.yaml (+164/-0) usr/lib/orange-box/examples/openstack/old-demos/havana-swift/bundle.yaml (+196/-0) usr/lib/orange-box/examples/openstack/old-demos/havana/01demo-prep.sh (+13/-0) usr/lib/orange-box/examples/openstack/old-demos/havana/02deploy.sh (+31/-0) usr/lib/orange-box/examples/openstack/old-demos/havana/03configure-cloud.sh (+17/-0) usr/lib/orange-box/examples/openstack/old-demos/havana/04cleanup.sh (+30/-0) usr/lib/orange-box/examples/openstack/old-demos/havana/README (+6/-0) usr/lib/orange-box/examples/openstack/old-demos/havana/bundle.yaml (+214/-0) usr/lib/orange-box/examples/openstack/old-demos/juju-config/environments.yaml (+13/-0) usr/lib/orange-box/examples/openstack/old-demos/juju-config/generate-jujuenv (+37/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/README (+21/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/configure-tests (+6/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/configure_tests.py (+60/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/devstack/config.py (+103/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/devstack/test_devstack_exercises.py (+105/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/devstack/test_utils/cloud.py (+351/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/devstack/test_utils/config.py (+46/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/devstack/test_utils/juju/client.py (+190/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/devstack/test_utils/juju/juju_deployer.py (+186/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/etc_master/all_variables (+31/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/etc_master/devstack.conf (+11/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/etc_master/devstack_templates/exerciserc (+32/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/etc_master/devstack_templates/openrc.master (+110/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/etc_master/devstack_templates/openrc.stable_essex (+100/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/etc_master/devstack_templates/openrc.stable_folsom (+110/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/etc_master/devstack_templates/openrc.stable_havana (+112/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/etc_master/openstack.conf (+26/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/get-cloud-images (+4/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/inspect-environment (+187/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/prepare-cloud (+57/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/prepare_cloud/folsom (+147/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-configuration/verify-cloud (+6/-0) usr/lib/orange-box/examples/openstack/old-demos/openstack-prereqs-install.sh (+183/-0) usr/lib/orange-box/examples/openstack/old-demos/remove-kvms.sh (+53/-0) usr/lib/orange-box/examples/telco/00-bootstrap.sh (+0/-12) usr/lib/orange-box/examples/telco/01-deploy.sh (+1/-1) usr/lib/orange-box/examples/telco/99-cleanup.sh (+0/-8) usr/lib/orange-box/examples/webdev-bundles/node-app/node-app.yaml (+3/-3)
To merge this branch:	bzr merge lp:~dweaver/orange-box-examples/orange-box-examples
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Dustin Kirkland 		2014-07-21	Pending
Review via email: mp+227654@code.launchpad.net