lp:~secroft/obsetup/trunk

Branch merges

Propose for merging

1 branch proposed for merging into this one.

No branches dependent on this one.

Merged into lp:~doug-s1k0ra/obsetup/mp-merge-cleanup

Scott Croft (community): Approve on 2015-12-09

mahmoh: Pending requested 2015-12-08

Diff: 2212 lines (+715/-787) (has conflicts)

17 files modified

03-maas_setup_config.sh (+114/-0)
05-juju_environment.sh (+59/-13)
demos/SDN/ODL/README (+3/-0)
demos/SDN/ODL/odl-ovs.yaml (+104/-0)
demos/SDN/contrail/contrail.yaml (+0/-176)
demos/SDN/contrail/contrail.yaml.bak (+0/-176)
demos/SDN/plumgrid/bundle.yaml (+0/-173)
demos/bin/orange-box-bootstrap-juju (+0/-39)
demos/bin/orange-box-configure-openstack (+0/-127)
demos/openstack/liberty-lxd/01-deploy.sh (+10/-0)
demos/openstack/liberty-lxd/README (+15/-0)
demos/openstack/liberty-lxd/configure-openstack-liberty (+136/-0)
demos/openstack/liberty-lxd/liberty-lxd.yaml (+249/-0)
demos/openstack/liberty-lxd/status (+25/-0)
import_SA_keys.sh (+0/-34)
obsetup1.sh (+0/-30)
obsetup2.sh (+0/-19)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

55. By Scott Croft on 2016-01-25

Adding Nobuto's improvements

54. By Scott Croft on 2016-01-22

Fixed virtual node addition script

53. By Scott Croft on 2016-01-22

Moved old 04 virtual node creation script back and added a test script for MAAS 1.9 integration

52. By Scott Croft on 2016-01-22

Fixed vm creation script to work with MAAS 1.9 and corrected misspelling of Michaels lp name

51. By Scott Croft on 2016-01-19

Adding verification code produced by Nobuto

50. By Scott Croft on 2016-01-18

Fixed node naming and password

49. By Scott Croft on 2016-01-18

Corrected remmina setup for OB# and node#

48. By Scott Croft on 2016-01-17

Changed path to desktop picture to correct path

47. By Scott Croft on 2016-01-17

Fixed vm naming

46. By Scott Croft on 2016-01-17

Fixed the loop for adding vm's as the "seq" command is deprecated