lp:~thomnico/orange-box-examples/telco

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:orange-box-examples

Orange Box Examples: Pending requested 2015-01-26

Diff: 174 lines (+34/-48)

6 files modified

.bzrignore (+0/-2)
telco/01-deploy.sh (+3/-7)
telco/BulkUsersCreation.sh (+21/-0)
telco/bundle-telco.yaml (+10/-9)
telco/fix-missing-link (+0/-10)
telco/sync-local-charms (+0/-20)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

74. By Nicolas Thomas on 2015-01-26

Adapted to using the store instead.
Fix link has been fixed in the charms.

removed:
  telco/fix-missing-link
modified:
  telco/01-deploy.sh
  telco/bundle-telco.yaml

73. By Nicolas Thomas on 2015-01-26

Merging for reconciliation

added:
  kubernetes/
  kubernetes/01-deploy.sh
  kubernetes/README
  telco/fix-missing-link
  telco/redirect-google-dns-to-ob
modified:
  99-cleanup.sh
  landscape/landscape-deployments-ob.yaml
  openstack/icehouse/trusty/icehouseOB.yaml
  openstack/juno/trusty/juno-local.yaml
  openstack/orange-box-configure-openstack
  openstack/orange-box-launch-openstack-juju
  telco/bundle-telco-store.yaml
pending merges:
  Darryl Weaver 2015-01-22 [merge] Merging kubernetes demo
    Takenori MATSUMOTO 2015-01-22 Takenori Matsumoto:
    Darryl Weaver 2015-01-09 Malte Menkhoff:
    Dustin Kirkland 2015-01-07 remove ~/.juju/environments, when forcibly cleaning up
    Darryl Weaver 2015-01-07 Adding script to redirect google DNS to Orange Box for use in Bluefin office and deploying telscale charm.
    Darryl Weaver 2015-01-07 Fix missing link for monit service to start clearwater services.
    Darryl Weaver 2015-01-06 Modified bundle-telco-store.yaml to installl SIPml5 from charm store.

72. By Nicolas Thomas on 2015-01-26

Remove the local charms as new policy allows to deploy namespace version with the Icons.
Add ability to create/setup predefine users for demos.

removed:
  telco/precise/
  telco/trusty/sipml5/
added:
  telco/BulkUsersCreation.sh

71. By Nicolas Thomas on 2014-11-12

modified:
  bin/orange-box-launch-openstack-juju
pending merges:
  Darryl Weaver 2014-11-12 Modified orange-box-launch-openstack-juju to correct errors.

70. By Nicolas Thomas on 2014-11-10

removed:
  telco/sync-local-charms

69. By Nicolas Thomas on 2014-11-10

Reflecting the changes in the files

modified:
  telco/bundle-telco.yaml

68. By Nicolas Thomas on 2014-11-10

Adding the actual charm in the branch to allow easy local deployment until fixed

added:
  telco/precise/
  telco/precise/clearwater-bono/
  telco/precise/clearwater-bono/README.md
  telco/precise/clearwater-bono/config.yaml
  telco/precise/clearwater-bono/copyright
  telco/precise/clearwater-bono/hooks/
  telco/precise/clearwater-bono/hooks/config-changed
  telco/precise/clearwater-bono/hooks/install
  telco/precise/clearwater-bono/hooks/programmable-multiple-relation-changed
  telco/precise/clearwater-bono/hooks/ralf-ctf-relation-changed
  telco/precise/clearwater-bono/hooks/scscf-relation-changed
  telco/precise/clearwater-bono/hooks/start
  telco/precise/clearwater-bono/hooks/stop
  telco/precise/clearwater-bono/hooks/upgrade-charm
  telco/precise/clearwater-bono/icon.svg
  telco/precise/clearwater-bono/lib/
  telco/precise/clearwater-bono/lib/chef_solo_install
  telco/precise/clearwater-bono/lib/config_script
  telco/precise/clearwater-bono/lib/node_json_script
  telco/precise/clearwater-bono/lib/node_json_template
  telco/precise/clearwater-bono/lib/restart
  telco/precise/clearwater-bono/lib/unit-get
  telco/precise/clearwater-bono/metadata.yaml
  telco/precise/clearwater-bono/revision
  telco/precise/clearwater-ellis/
  telco/precise/clearwater-ellis/README.md
  telco/precise/clearwater-ellis/config.yaml
  telco/precise/clearwater-ellis/copyright
  telco/precise/clearwater-ellis/hooks/
  telco/precise/clearwater-ellis/hooks/as-catalog-relation-changed
  telco/precise/clearwater-ellis/hooks/as-catalog-relation-departed
  telco/precise/clearwater-ellis/hooks/config-changed
  telco/precise/clearwater-ellis/hooks/homestead-prov-relation-changed
  telco/precise/clearwater-ellis/hooks/install
  telco/precise/clearwater-ellis/hooks/programmable-multiple-relation-changed
  telco/precise/clearwater-ellis/hooks/start
  telco/precise/clearwater-ellis/hooks/stop
  telco/precise/clearwater-ellis/hooks/upgrade-charm
  telco/precise/clearwater-ellis/hooks/xdms-relation-changed
  telco/precise/clearwater-ellis/icon.svg
  telco/precise/clearwater-ellis/lib/
  telco/precise/clearwater-ellis/lib/chef_solo_install
  telco/precise/clearwater-ellis/lib/config_script
  telco/precise/clearwater-ellis/lib/node_json_script
  telco/precise/clearwater-ellis/lib/node_json_template
  telco/precise/clearwater-ellis/lib/restart
  telco/precise/clearwater-ellis/lib/unit-get
  telco/precise/clearwater-ellis/metadata.yaml
  telco/precise/clearwater-ellis/revision
  telco/precise/clearwater-homer/
  telco/precise/clearwater-homer/README.md
  telco/precise/clearwater-homer/config.yaml
  telco/precise/clearwater-homer/copyright
  telco/precise/clearwater-homer/hooks/
  telco/precise/clearwater-homer/hooks/config-changed
  telco/precise/clearwater-homer/hooks/homer-relation-changed
  telco/precise/clearwater-homer/hooks/homer-relation-departed
  telco/precise/clearwater-homer/hooks/homer-relation-joined
  telco/precise/clearwater-homer/hooks/install
  telco/precise/clearwater-homer/hooks/programmable-multiple-relation-changed
  telco/precise/clearwater-homer/hooks/start
  telco/precise/clearwater-homer/hooks/stop
  telco/precise/clearwater-homer/hooks/upgrade-charm
  telco/precise/clearwater-homer/hooks/xdms-user-relation-joined
  telco/precise/clearwater-homer/icon.svg
  telco/precise/clearwater-homer/lib/
  telco/precise/clearwater-homer/lib/chef_solo_install
  telco/precise/clearwater-homer/lib/config_script
  telco/precise/clearwater-homer/lib/node_json_clustered_script
  telco/precise/clearwater-homer/lib/node_json_clustered_template
  telco/precise/clearwater-homer/lib/node_json_script
  telco/precise/clearwater-homer/lib/node_json_template
  telco/precise/clearwater-homer/lib/restart
  telco/precise/clearwater-homer/lib/unit-get
  telco/precise/clearwater-homer/metadata.yaml
  telco/precise/clearwater-homer/revision
  telco/precise/clearwater-homestead/
  telco/precise/clearwater-homestead/README.md
  telco/precise/clearwater-homestead/config.yaml
  telco/precise/clearwater-homestead/copyright
  telco/precise/clearwater-homestead/hooks/
  telco/precise/clearwater-homestead/hooks/config-changed
  telco/precise/clearwater-homestead/hooks/homestead-cscf-relation-joined
  telco/precise/clearwater-homestead/hooks/homestead-prov-user-relation-joined
  telco/precise/clearwater-homestead/hooks/homestead-relation-changed
  telco/precise/clearwater-homestead/hooks/homestead-relation-departed
  telco/precise/clearwater-homestead/hooks/homestead-relation-joined
  telco/precise/clearwater-homestead/hooks/install
  telco/precise/clearwater-homestead/hooks/programmable-multiple-relation-changed
  telco/precise/clearwater-homestead/hooks/start
  telco/precise/clearwater-homestead/hooks/stop
  telco/precise/clearwater-homestead/hooks/upgrade-charm
  telco/precise/clearwater-homestead/icon.svg
  telco/precise/clearwater-homestead/lib/
  telco/precise/clearwater-homestead/lib/chef_solo_install
  telco/precise/clearwater-homestead/lib/config_script
  telco/precise/clearwater-homestead/lib/node_json_clustered_script
  telco/precise/clearwater-homestead/lib/node_json_clustered_template
  telco/precise/clearwater-homestead/lib/node_json_script
  telco/precise/clearwater-homestead/lib/node_json_template
  telco/precise/clearwater-homestead/lib/restart
  telco/precise/clearwater-homestead/lib/unit-get
  telco/precise/clearwater-homestead/metadata.yaml
  telco/precise/clearwater-homestead/revision
  telco/precise/clearwater-ralf/
  telco/precise/clearwater-ralf/README.md
  telco/precise/clearwater-ralf/config.yaml
  telco/precise/clearwater-ralf/copyright
  telco/precise/clearwater-ralf/hooks/
  telco/precise/clearwater-ralf/hooks/config-changed
  telco/precise/clearwater-ralf/hooks/install
  telco/precise/clearwater-ralf/hooks/programmable-multiple-relation-changed
  telco/precise/clearwater-ralf/hooks/ralf-cscf-relation-joined
  telco/precise/clearwater-ralf/hooks/start
  telco/precise/clearwater-ralf/hooks/stop
  telco/precise/clearwater-ralf/hooks/upgrade-charm
  telco/precise/clearwater-ralf/icon.svg
  telco/precise/clearwater-ralf/lib/
  telco/precise/clearwater-ralf/lib/chef_solo_install
  telco/precise/clearwater-ralf/lib/config_script
  telco/precise/clearwater-ralf/lib/node_json_clustered_script
  telco/precise/clearwater-ralf/lib/node_json_clustered_template
  telco/precise/clearwater-ralf/lib/node_json_script
  telco/precise/clearwater-ralf/lib/node_json_template
  telco/precise/clearwater-ralf/lib/restart
  telco/precise/clearwater-ralf/lib/unit-get
  telco/precise/clearwater-ralf/metadata.yaml
  telco/precise/clearwater-ralf/revision
  telco/precise/clearwater-sprout/
  telco/precise/clearwater-sprout/README.md
  telco/precise/clearwater-sprout/config.yaml
  telco/precise/clearwater-sprout/copyright
  telco/precise/clearwater-sprout/hooks/
  telco/precise/clearwater-sprout/hooks/as-relation-joined
  telco/precise/clearwater-sprout/hooks/config-changed
  telco/precise/clearwater-sprout/hooks/homestead-hss-relation-changed
  telco/precise/clearwater-sprout/hooks/install
  telco/precise/clearwater-sprout/hooks/pcscf-relation-joined
  telco/precise/clearwater-sprout/hooks/programmable-multiple-relation-changed
  telco/precise/clearwater-sprout/hooks/ralf-ctf-relation-changed
  telco/precise/clearwater-sprout/hooks/sprout-relation-changed
  telco/precise/clearwater-sprout/hooks/sprout-relation-departed
  telco/precise/clearwater-sprout/hooks/sprout-relation-joined
  telco/precise/clearwater-sprout/hooks/start
  telco/precise/clearwater-sprout/hooks/stop
  telco/precise/clearwater-sprout/hooks/upgrade-charm
  telco/precise/clearwater-sprout/hooks/xdms-relation-changed
  telco/precise/clearwater-sprout/icon.svg
  telco/precise/clearwater-sprout/lib/
  telco/precise/clearwater-sprout/lib/chef_solo_install
  telco/precise/clearwater-sprout/lib/config_script
  telco/precise/clearwater-sprout/lib/node_json_clustered_script
  telco/precise/clearwater-sprout/lib/node_json_clustered_template
  telco/precise/clearwater-sprout/lib/node_json_script
  telco/precise/clearwater-sprout/lib/node_json_template
  telco/precise/clearwater-sprout/lib/restart
  telco/precise/clearwater-sprout/lib/unit-get
  telco/precise/clearwater-sprout/metadata.yaml
  telco/precise/clearwater-sprout/revision
  telco/precise/dns/
  telco/precise/dns/.gitignore
  telco/precise/dns/Makefile
  telco/precise/dns/README.md
  telco/precise/dns/bin/
  telco/precise/dns/bin/charm_helpers_sync.py
  telco/precise/dns/charm-helpers.yaml
  telco/precise/dns/config.yaml
  telco/precise/dns/contrib/
  telco/precise/dns/contrib/__init__.py
  telco/precise/dns/contrib/bind/
  telco/precise/dns/contrib/bind/__init__.py
  telco/precise/dns/contrib/bind/install.py
  telco/precise/dns/contrib/bind/provider.py
  telco/precise/dns/contrib/bind/provider.py.orig
  telco/precise/dns/contrib/bind/templates/
  telco/precise/dns/contrib/bind/templates/named.conf.options.jinja2
  telco/precise/dns/contrib/bind/templates/zone.jinja2
  telco/precise/dns/contrib/bind/zone.py
  telco/precise/dns/contrib/bind/zoneparser.py
  telco/precise/dns/contrib/example.com.db
  telco/precise/dns/contrib/tests/
  telco/precise/dns/contrib/tests/fixtures/
  telco/precise/dns/contrib/tests/fixtures/sample_bind_parsed
  telco/precise/dns/contrib/tests/test_bind_provider.py
  telco/precise/dns/contrib/tests/test_zone.py
  telco/precise/dns/contrib/tests/test_zoneparser.py
  telco/precise/dns/copyright
  telco/precise/dns/docs/
  telco/precise/dns/docs/HACKING.md
  telco/precise/dns/docs/provider.md
  telco/precise/dns/docs/spec-diagrams.pdf
  telco/precise/dns/docs/spec-document.pdf
  telco/precise/dns/files/
  telco/precise/dns/files/bind/
  telco/precise/dns/files/bind/1_libcap2_1%3a2.24-0ubuntu2_i386.deb
  telco/precise/dns/files/bind/2_bind9_1%3a9.8.1.dfsg.P1-4ubuntu0.8_amd64.deb
  telco/precise/dns/files/bind/3_bind9utils_1%3a9.8.1.dfsg.P1-4ubuntu0.8_amd64.deb
  telco/precise/dns/files/bind/pip/
  telco/precise/dns/files/bind/pip/Jinja2-2.7.2.tar.gz
  telco/precise/dns/files/bind/pip/tldextract-1.3.1.tar.gz
  telco/precise/dns/files/core/
  telco/precise/dns/files/core/python-pip_1.0-1build1_all.deb
  telco/precise/dns/files/core/python-setuptools_0.6.24-1ubuntu1_all.deb
  telco/precise/dns/hooks/
  telco/precise/dns/hooks/__init__.py
  telco/precise/dns/hooks/config-changed
  telco/precise/dns/hooks/dns-client-relation-changed
  telco/precise/dns/hooks/install
  telco/precise/dns/hooks/programmable-multiple-relation-changed
  telco/precise/dns/hooks/programmable-relation-changed
  telco/precise/dns/hooks/programmable-relation-departed
  telco/precise/dns/icon.svg
  telco/precise/dns/lib/
  telco/precise/dns/lib/__init__.py
  telco/precise/dns/lib/charmhelpers/
  telco/precise/dns/lib/charmhelpers/__init__.py
  telco/precise/dns/lib/charmhelpers/core/
  telco/precise/dns/lib/charmhelpers/core/__init__.py
  telco/precise/dns/lib/charmhelpers/core/hookenv.py
  telco/precise/dns/lib/charmhelpers/core/host.py
  telco/precise/dns/lib/charmhelpers/fetch/
  telco/precise/dns/lib/charmhelpers/fetch/__init__.py
  telco/precise/dns/lib/charmhelpers/fetch/archiveurl.py
  telco/precise/dns/lib/charmhelpers/fetch/bzrurl.py
  telco/precise/dns/lib/common.py
  telco/precise/dns/metadata.yaml
  telco/precise/dns/requirements.txt
  telco/precise/dns/tests/
  telco/precise/dns/tests/10_test_common.py
  telco/precise/dns/tests/__init__.py
modified:
  .bzrignore
  telco/bundle-telco.yaml
unknown:
  push-images-into-maas.sh
  bin/enable_dns_caching.patch
  bin/orange-box-wildcard-dns-archive
  cloudfoundry/cf-bundle-gui.yaml
  cloudfoundry/cf-bundle-store.yaml
  cloudfoundry/cf-bundle.yaml
  telco/bundle-telco-juju.guru.yaml
  telco/bzr-sync-local-charms
  telco/clearwater-conf.yaml

67. By Nicolas Thomas on 2014-11-10

Adding sipml5 to the mix

added:
  telco/trusty/
  telco/trusty/sipml5/
  telco/trusty/sipml5/README.md
  telco/trusty/sipml5/config.yaml
  telco/trusty/sipml5/hooks/
  telco/trusty/sipml5/hooks/config-changed
  telco/trusty/sipml5/hooks/dns-client-relation-changed
  telco/trusty/sipml5/hooks/install
  telco/trusty/sipml5/hooks/programmable-multiple-relation-changed
  telco/trusty/sipml5/hooks/start
  telco/trusty/sipml5/hooks/stop
  telco/trusty/sipml5/hooks/upgrade-charm
  telco/trusty/sipml5/icon.svg
  telco/trusty/sipml5/lib/
  telco/trusty/sipml5/lib/unit-get
  telco/trusty/sipml5/metadata.yaml
  telco/trusty/sipml5/revision
modified:
  telco/01-deploy.sh
  telco/bundle-telco.yaml

66. By Nicolas Thomas on 2014-11-10

Use the dns/sipml5 from store until can get bzr to be fixed..

modified:
  telco/bundle-telco-store.yaml
  telco/bundle-telco.yaml

Pending merge:
  Darryl Weaver 2014-11-10 [merge] Nicolas Thomas 2014-11-10 Modified Telco to use the github account instead of bzr for easier get without login.

65. By Nicolas Thomas on 2014-11-10

remove :

  telco/trusty/