lp:~mmenkhof/orange-box-examples/orange-box-examples-cleanup

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:~kirkland/orange-box-examples/trunk

Dustin Kirkland : Pending requested 2014-08-07

Diff: 137 lines (+91/-0)

8 files modified

usr/lib/orange-box/examples/app-bundles/elasticsearch/01_deploy_elasticsearch (+2/-0)
usr/lib/orange-box/examples/app-bundles/elasticsearch/02_postdeploy.sh (+9/-0)
usr/lib/orange-box/examples/app-bundles/elasticsearch/README (+6/-0)
usr/lib/orange-box/examples/app-bundles/elasticsearch/elasticsearch.yaml (+18/-0)
usr/lib/orange-box/examples/app-bundles/inkabinka/01_deploy_inkabinka (+2/-0)
usr/lib/orange-box/examples/app-bundles/inkabinka/02_postdeploy.sh (+3/-0)
usr/lib/orange-box/examples/app-bundles/inkabinka/README (+6/-0)
usr/lib/orange-box/examples/app-bundles/inkabinka/inkabinka.yaml (+45/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

25. By Malte Menkhoff on 2014-08-07

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

24. By Malte Menkhoff on 2014-08-05

mme 05082014 - added two demos: inkabinka + elasticsearch

23. By Dustin Kirkland  on 2014-07-28

opening 1.8

22. By Dustin Kirkland  on 2014-07-28

releasing 1.7

21. By Dustin Kirkland  on 2014-07-28

* usr/lib/orange-box/examples/infrastructure/precise/infrastructure-
  bundle.yaml, usr/lib/orange-
  box/examples/infrastructure/trusty/infrastructure-bundle.yaml,
  usr/lib/orange-
  box/examples/openstack/icehouse/precise/icehouseOB.yaml,
  usr/lib/orange-box/examples/openstack/icehouse/precise/integrate-
  infrastructure.sh, usr/lib/orange-
  box/examples/openstack/icehouse/trusty/icehouseOB.yaml,
  usr/lib/orange-box/examples/openstack/icehouse/trusty/integrate-
  infrastructure.sh:
  - Adding integrate-infrastructure.sh to combine openstack with
    infrastructure services.
  - Changing tags to physical and virtual.

20. By Dustin Kirkland  on 2014-07-25

opening 1.7

19. By Dustin Kirkland  on 2014-07-25

releasing 1.6

18. By Dustin Kirkland  on 2014-07-25

* === removed directory usr/lib/orange-box/examples/openstack/havana,
  usr/lib/orange-box/examples/openstack/havana/01-deploy.sh,
  usr/lib/orange-box/examples/openstack/havana/havanaOB.yaml,
  usr/lib/orange-box/examples/openstack/havana/README, usr/lib/orange-
  box/examples/openstack/icehouse/precise/icehouseOB.yaml,
  usr/lib/orange-
  box/examples/openstack/icehouse/trusty/icehouseOB.yaml:
  - ensure nova-compute gets deployed to physical machines
  - deprecate havana; we should be demo'ing icehouse exclusively
    at this point

17. By Dustin Kirkland  on 2014-07-25

* === added directory usr/lib/orange-box/examples/infrastructure, ===
  added directory usr/lib/orange-box/examples/infrastructure/precise,
  === added directory usr/lib/orange-
  box/examples/infrastructure/trusty, === added directory
  usr/lib/orange-box/examples/landscape, === added directory
  usr/lib/orange-box/examples/openstack/old-demos, === added directory
  usr/lib/orange-box/examples/openstack/old-demos/havana, === added
  directory usr/lib/orange-box/examples/openstack/old-demos/havana-
  colo, === added directory usr/lib/orange-box/examples/openstack/old-
  demos/havana-compute, === added directory usr/lib/orange-
  box/examples/openstack/old-demos/havana-swift, === added directory
  usr/lib/orange-box/examples/openstack/old-demos/juju-config, ===
  added directory usr/lib/orange-box/examples/openstack/old-
  demos/openstack-configuration, === added directory usr/lib/orange-
  box/examples/openstack/old-demos/openstack-configuration/devstack,
  === added directory usr/lib/orange-box/examples/openstack/old-
  demos/openstack-configuration/devstack/test_utils, === added
  directory usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/devstack/test_utils/juju, === added directory
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/etc_master, === added directory usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/etc_master/devstack_templates, === added directory
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/prepare_cloud, === added symlink usr/lib/orange-
  box/examples/openstack/old-demos/havana-colo/01demo-prep.sh, ===
  added symlink usr/lib/orange-box/examples/openstack/old-
  demos/havana-colo/02deploy.sh, === added symlink usr/lib/orange-
  box/examples/openstack/old-demos/havana-colo/03configure-cloud.sh,
  === added symlink usr/lib/orange-box/examples/openstack/old-
  demos/havana-colo/04cleanup.sh, === added symlink usr/lib/orange-
  box/examples/openstack/old-demos/havana-colo/README, === added
  symlink usr/lib/orange-box/examples/openstack/old-demos/havana-
  compute/01demo-prep.sh, === added symlink usr/lib/orange-
  box/examples/openstack/old-demos/havana-compute/02deploy.sh, ===
  added symlink usr/lib/orange-box/examples/openstack/old-
  demos/havana-compute/04cleanup.sh, === added symlink usr/lib/orange-
  box/examples/openstack/old-demos/havana-compute/README, === added
  symlink usr/lib/orange-box/examples/openstack/old-demos/havana-
  swift/01demo-prep.sh, === added symlink usr/lib/orange-
  box/examples/openstack/old-demos/havana-swift/02deploy.sh, === added
  symlink usr/lib/orange-box/examples/openstack/old-demos/havana-
  swift/03configure-cloud.sh, === added symlink usr/lib/orange-
  box/examples/openstack/old-demos/havana-swift/04cleanup.sh, ===
  added symlink usr/lib/orange-box/examples/openstack/old-
  demos/havana-swift/README, === added symlink usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/prepare_cloud/essex, === added symlink usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/prepare_cloud/grizzly, === added symlink
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/prepare_cloud/havana, === added symlink
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/prepare_cloud/icehouse, === removed directory
  usr/lib/orange-box/examples/app-bundles/owncloud, === removed
  directory usr/lib/orange-box/examples/openstack/complex, === removed
  directory usr/lib/orange-box/examples/openstack/complex/havana, ===
  removed directory usr/lib/orange-
  box/examples/openstack/complex/havana-colo, === removed directory
  usr/lib/orange-box/examples/openstack/complex/havana-compute, ===
  removed directory usr/lib/orange-
  box/examples/openstack/complex/havana-swift, === removed directory
  usr/lib/orange-box/examples/openstack/complex/juju-config, ===
  removed directory usr/lib/orange-
  box/examples/openstack/complex/openstack-configuration, === removed
  directory usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/devstack, === removed directory usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/devstack/test_utils, === removed directory
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/devstack/test_utils/juju, === removed directory
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/etc_master, === removed directory usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/etc_master/devstack_templates, === removed directory
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/prepare_cloud, === removed symlink usr/lib/orange-
  box/examples/openstack/complex/havana-colo/01demo-prep.sh, ===
  removed symlink usr/lib/orange-
  box/examples/openstack/complex/havana-colo/02deploy.sh, === removed
  symlink usr/lib/orange-box/examples/openstack/complex/havana-
  colo/03configure-cloud.sh, === removed symlink usr/lib/orange-
  box/examples/openstack/complex/havana-colo/04cleanup.sh, === removed
  symlink usr/lib/orange-box/examples/openstack/complex/havana-
  colo/README, === removed symlink usr/lib/orange-
  box/examples/openstack/complex/havana-compute/01demo-prep.sh, ===
  removed symlink usr/lib/orange-
  box/examples/openstack/complex/havana-compute/02deploy.sh, ===
  removed symlink usr/lib/orange-
  box/examples/openstack/complex/havana-compute/04cleanup.sh, ===
  removed symlink usr/lib/orange-
  box/examples/openstack/complex/havana-compute/README, === removed
  symlink usr/lib/orange-box/examples/openstack/complex/havana-
  swift/01demo-prep.sh, === removed symlink usr/lib/orange-
  box/examples/openstack/complex/havana-swift/02deploy.sh, === removed
  symlink usr/lib/orange-box/examples/openstack/complex/havana-
  swift/03configure-cloud.sh, === removed symlink usr/lib/orange-
  box/examples/openstack/complex/havana-swift/04cleanup.sh, ===
  removed symlink usr/lib/orange-
  box/examples/openstack/complex/havana-swift/README, === removed
  symlink usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/prepare_cloud/essex, === removed symlink
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/prepare_cloud/grizzly, === removed symlink
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/prepare_cloud/havana, === removed symlink
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/prepare_cloud/icehouse, === target is ufolsom, ===
  target is ugrizzly, === target is uhavana, === target is
  u../havana/01demo-prep.sh, === target is u../havana/02deploy.sh, ===
  target is u../havana/03configure-cloud.sh, === target is
  u../havana/04cleanup.sh, === target is u../havana/README, === target
  was ufolsom, === target was ugrizzly, === target was uhavana, ===
  target was u../havana/01demo-prep.sh, === target was
  u../havana/02deploy.sh, === target was u../havana/03configure-
  cloud.sh, === target was u../havana/04cleanup.sh, === target was
  u../havana/README, usr/lib/orange-box/examples/00-bootstrap.sh,
  usr/lib/orange-box/examples/99-cleanup.sh, usr/lib/orange-
  box/examples/app-bundles/owncloud/owncloud-bundle.yaml,
  usr/lib/orange-box/examples/hadoop/00-bootstrap.sh, usr/lib/orange-
  box/examples/hadoop/01-deploy.sh, usr/lib/orange-
  box/examples/hadoop/01-get-juju-gui-info.sh, usr/lib/orange-
  box/examples/hadoop/02-hadoop.yaml, usr/lib/orange-
  box/examples/hadoop/02-run-terasort.sh, usr/lib/orange-
  box/examples/hadoop/03-hive-demo.txt, usr/lib/orange-
  box/examples/hadoop/03-run-terasort.sh, usr/lib/orange-
  box/examples/hadoop/04-hive-demo.txt, usr/lib/orange-
  box/examples/hadoop/demo.sh, usr/lib/orange-
  box/examples/hadoop/hadoop.yaml, usr/lib/orange-
  box/examples/hadoop/README, usr/lib/orange-
  box/examples/infrastructure/precise/01-deploy.sh, usr/lib/orange-
  box/examples/infrastructure/precise/infrastructure-bundle.yaml,
  usr/lib/orange-box/examples/infrastructure/trusty/01-deploy.sh,
  usr/lib/orange-box/examples/infrastructure/trusty/infrastructure-
  bundle.yaml, usr/lib/orange-box/examples/landscape/01-deploy.sh,
  usr/lib/orange-box/examples/landscape/landscape-deployments-ob.yaml,
  usr/lib/orange-box/examples/landscape/README, usr/lib/orange-
  box/examples/openstack/complex/bridge2.xml, usr/lib/orange-
  box/examples/openstack/complex/havana/01demo-prep.sh,
  usr/lib/orange-box/examples/openstack/complex/havana/02deploy.sh,
  usr/lib/orange-box/examples/openstack/complex/havana/03configure-
  cloud.sh, usr/lib/orange-
  box/examples/openstack/complex/havana/04cleanup.sh, usr/lib/orange-
  box/examples/openstack/complex/havana/bundle.yaml, usr/lib/orange-
  box/examples/openstack/complex/havana-colo/bundle.yaml,
  usr/lib/orange-box/examples/openstack/complex/havana-
  compute/03configure-cloud.sh, usr/lib/orange-
  box/examples/openstack/complex/havana-compute/bundle.yaml,
  usr/lib/orange-box/examples/openstack/complex/havana/README,
  usr/lib/orange-box/examples/openstack/complex/havana-
  swift/bundle.yaml, usr/lib/orange-
  box/examples/openstack/complex/juju-config/environments.yaml,
  usr/lib/orange-box/examples/openstack/complex/juju-config/generate-
  jujuenv, usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/configure-tests, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/configure_tests.py, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/devstack/config.py, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/devstack/__init__.py, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/devstack/test_devstack_exercises.py, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/devstack/test_utils/cloud.py, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/devstack/test_utils/config.py, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/devstack/test_utils/__init__.py, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/devstack/test_utils/juju/client.py, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/devstack/test_utils/juju/__init__.py, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/devstack/test_utils/juju/juju_deployer.py,
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/etc_master/all_variables, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/etc_master/devstack.conf, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/etc_master/devstack_templates/exerciserc,
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/etc_master/devstack_templates/openrc.master,
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/etc_master/devstack_templates/openrc.stable_essex,
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/etc_master/devstack_templates/openrc.stable_folsom,
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/etc_master/devstack_templates/openrc.stable_havana,
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/etc_master/openstack.conf, usr/lib/orange-
  box/examples/openstack/complex/openstack-configuration/get-cloud-
  images, usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/inspect-environment, usr/lib/orange-
  box/examples/openstack/complex/openstack-configuration/prepare-
  cloud, usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/prepare_cloud/folsom, usr/lib/orange-
  box/examples/openstack/complex/openstack-configuration/README,
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/verify-cloud, usr/lib/orange-
  box/examples/openstack/complex/openstack-prereqs-install.sh,
  usr/lib/orange-box/examples/openstack/complex/README,
  usr/lib/orange-box/examples/openstack/complex/remove-kvms.sh,
  usr/lib/orange-box/examples/openstack/havana/99-cleanup.sh,
  usr/lib/orange-box/examples/openstack/icehouse/precise/00-
  bootstrap.sh, usr/lib/orange-
  box/examples/openstack/icehouse/precise/01-deploy.sh,
  usr/lib/orange-box/examples/openstack/icehouse/precise/02-configure-
  openstack.sh, usr/lib/orange-
  box/examples/openstack/icehouse/precise/04-deploy-jumpserver-and-
  juju.sh, usr/lib/orange-box/examples/openstack/icehouse/precise/99-
  cleanup.sh, usr/lib/orange-
  box/examples/openstack/icehouse/precise/automated-deploy.sh,
  usr/lib/orange-box/examples/openstack/icehouse/precise/deploy-
  instances.sh, usr/lib/orange-
  box/examples/openstack/icehouse/precise/icehouseOB.yaml,
  usr/lib/orange-box/examples/openstack/icehouse/precise/README,
  usr/lib/orange-box/examples/openstack/icehouse/trusty/00-
  bootstrap.sh, usr/lib/orange-
  box/examples/openstack/icehouse/trusty/01-deploy.sh, usr/lib/orange-
  box/examples/openstack/icehouse/trusty/02-configure-openstack.sh,
  usr/lib/orange-box/examples/openstack/icehouse/trusty/04-deploy-
  jumpserver-and-juju.sh, usr/lib/orange-
  box/examples/openstack/icehouse/trusty/99-cleanup.sh,
  usr/lib/orange-box/examples/openstack/icehouse/trusty/automated-
  deploy.sh, usr/lib/orange-
  box/examples/openstack/icehouse/trusty/deploy-instances.sh,
  usr/lib/orange-
  box/examples/openstack/icehouse/trusty/icehouseOB.yaml,
  usr/lib/orange-box/examples/openstack/icehouse/trusty/nova.rc,
  usr/lib/orange-box/examples/openstack/icehouse/trusty/README,
  usr/lib/orange-box/examples/openstack/old-demos/bridge2.xml,
  usr/lib/orange-box/examples/openstack/old-demos/havana/01demo-
  prep.sh, usr/lib/orange-box/examples/openstack/old-
  demos/havana/02deploy.sh, usr/lib/orange-box/examples/openstack/old-
  demos/havana/03configure-cloud.sh, usr/lib/orange-
  box/examples/openstack/old-demos/havana/04cleanup.sh,
  usr/lib/orange-box/examples/openstack/old-demos/havana/bundle.yaml,
  usr/lib/orange-box/examples/openstack/old-demos/havana-
  colo/bundle.yaml, usr/lib/orange-box/examples/openstack/old-
  demos/havana-compute/03configure-cloud.sh, usr/lib/orange-
  box/examples/openstack/old-demos/havana-compute/bundle.yaml,
  usr/lib/orange-box/examples/openstack/old-demos/havana/README,
  usr/lib/orange-box/examples/openstack/old-demos/havana-
  swift/bundle.yaml, usr/lib/orange-box/examples/openstack/old-
  demos/juju-config/environments.yaml, usr/lib/orange-
  box/examples/openstack/old-demos/juju-config/generate-jujuenv,
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/configure-tests, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/configure_tests.py, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/devstack/config.py, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/devstack/__init__.py, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/devstack/test_devstack_exercises.py, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/devstack/test_utils/cloud.py, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/devstack/test_utils/config.py, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/devstack/test_utils/__init__.py, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/devstack/test_utils/juju/client.py, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/devstack/test_utils/juju/__init__.py, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/devstack/test_utils/juju/juju_deployer.py,
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/etc_master/all_variables, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/etc_master/devstack.conf, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/etc_master/devstack_templates/exerciserc,
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/etc_master/devstack_templates/openrc.master,
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/etc_master/devstack_templates/openrc.stable_essex,
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/etc_master/devstack_templates/openrc.stable_folsom,
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/etc_master/devstack_templates/openrc.stable_havana,
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/etc_master/openstack.conf, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-configuration/get-cloud-
  images, usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/inspect-environment, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-configuration/prepare-
  cloud, usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/prepare_cloud/folsom, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-configuration/README,
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/verify-cloud, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-prereqs-install.sh,
  usr/lib/orange-box/examples/openstack/old-demos/README,
  usr/lib/orange-box/examples/openstack/old-demos/remove-kvms.sh,
  usr/lib/orange-box/examples/openstack/old-
  demos/SUPERCEDED_USE_ICEHOUSE, usr/lib/orange-box/examples/README,
  usr/lib/orange-box/examples/telco/00-bootstrap.sh, usr/lib/orange-
  box/examples/telco/01-deploy.sh, usr/lib/orange-
  box/examples/telco/99-cleanup.sh, usr/lib/orange-
  box/examples/webdev-bundles/node-app/node-app.yaml:
  - Modified all bundles to fix version numbers of deployed charms.
  - Removed individual 00-bootstrap.sh and 99-cleanup.sh commands to
    use generic version.
  - Modified 00-bootstrap.sh to allow booting requested series
    (either precise or trusty).
  - Modified icehouse bundles to position in the GUI.
  - Added Landscape deployment for Landscape Installer demos.

16. By Dustin Kirkland  on 2014-07-16

opening 1.6