[DON'T MERGE] [Reviewer: Rob] Move up to using Ubuntu Trusty and latest Clearwater

bundle-config.yaml.example

@@ -5,7 +5,7 @@ clearwater:
         # Deployment-wide options
         # These options should be set to the same value for all Clearwater charms
         zone: "ims.clearwater.local"
-        repo: "http://repo.cw-ngv.com/juju-clearwater-1"
+        repo: "http://repo.cw-ngv.com/juju-clearwater-2"
         sas: "0.0.0.0"
 
         # Bono-specific options
@@ -16,7 +16,7 @@ clearwater:
         # Deployment-wide options
         # These options should be set to the same value for all Clearwater charms
         zone: "ims.clearwater.local"
-        repo: "http://repo.cw-ngv.com/juju-clearwater-1"
+        repo: "http://repo.cw-ngv.com/juju-clearwater-2"
         sas: "0.0.0.0"
 
         # Sprout-specific options
@@ -29,27 +29,27 @@ clearwater:
         # Deployment-wide options
         # These options should be set to the same value for all Clearwater charms
         zone: "ims.clearwater.local"
-        repo: "http://repo.cw-ngv.com/juju-clearwater-1"
+        repo: "http://repo.cw-ngv.com/juju-clearwater-2"
         sas: "0.0.0.0"
     "clearwater-homestead":
       options:
         # Deployment-wide options
         # These options should be set to the same value for all Clearwater charms
         zone: "ims.clearwater.local"
-        repo: "http://repo.cw-ngv.com/juju-clearwater-1"
+        repo: "http://repo.cw-ngv.com/juju-clearwater-2"
         sas: "0.0.0.0"
     "clearwater-homer":
       options:
         # Deployment-wide options
         # These options should be set to the same value for all Clearwater charms
         zone: "ims.clearwater.local"
-        repo: "http://repo.cw-ngv.com/juju-clearwater-1"
+        repo: "http://repo.cw-ngv.com/juju-clearwater-2"
     "clearwater-ellis":
       options:
         # Deployment-wide options
         # These options should be set to the same value for all Clearwater charms
         zone: "ims.clearwater.local"
-        repo: "http://repo.cw-ngv.com/juju-clearwater-1"
+        repo: "http://repo.cw-ngv.com/juju-clearwater-2"
 
         # Ellis-specific options
         # Ellis' role is to allocate numbers to users, out of a preconfigured pool. The base_number and number_count settings define that pool - for example, with these values, Ellis could allocate sip:1234567000@ims.clearwater.local to sip:1234567999@ims.clearwater.local.

charms/bundles/clearwater/bundle/bundles.yaml

@@ -1,8 +1,7 @@
 clearwater:
   services:
     "clearwater-bono":
-      charm: "local:precise/clearwater-bono"
-      charm_url: "local:precise/clearwater-bono"
+      charm: "clearwater-bono"
       num_units: 1
       constraints: "arch=amd64"
       options:
@@ -12,8 +11,7 @@ clearwater:
         "gui-x": "400"
         "gui-y": "900"
     "clearwater-sprout":
-      charm: "local:precise/clearwater-sprout"
-      charm_url: "local:precise/clearwater-sprout"
+      charm: "clearwater-sprout"
       num_units: 1
       constraints: "arch=amd64"
       options:
@@ -22,8 +20,7 @@ clearwater:
         "gui-x": "400"
         "gui-y": "600"
     "clearwater-ralf":
-      charm: "local:precise/clearwater-ralf"
-      charm_url: "local:precise/clearwater-ralf"
+      charm: "clearwater-ralf"
       num_units: 1
       constraints: "arch=amd64"
       options:
@@ -32,8 +29,7 @@ clearwater:
         "gui-x": "800"
         "gui-y": "750"
     "clearwater-homestead":
-      charm: "local:precise/clearwater-homestead"
-      charm_url: "local:precise/clearwater-homestead"
+      charm: "clearwater-homestead"
       num_units: 1
       constraints: "arch=amd64"
       options:
@@ -42,8 +38,7 @@ clearwater:
         "gui-x": "200"
         "gui-y": "300"
     "clearwater-homer":
-      charm: "local:precise/clearwater-homer"
-      charm_url: "local:precise/clearwater-homer"
+      charm: "clearwater-homer"
       num_units: 1
       constraints: "arch=amd64"
       options:
@@ -52,8 +47,7 @@ clearwater:
         "gui-x": "600"
         "gui-y": "300"
     "clearwater-ellis":
-      charm: "local:precise/clearwater-ellis"
-      charm_url: "local:precise/clearwater-ellis"
+      charm: "clearwater-ellis"
       num_units: 1
       constraints: "arch=amd64"
       options:
@@ -100,4 +94,4 @@ clearwater:
       - "dns:programmable-multiple"
     - - "clearwater-homestead:programmable-multiple"
       - "dns:programmable-multiple"
-  series: precise
+  series: trusty