Merge lp:~ahasenack/landscape-charm/landscape-charm-use-trusty into lp:~landscape/landscape-charm/trunk

[Andreas Hasenack]

Change the deployer file to use trusty where possible for the charms we deploy.

This branch switches all charms to use trusty, except haproxy, which doesn't have a trusty charm yet.

Finally, there is a small fix to the test_msg test because LDS trunk is now returning a new field, in addition to the tested ones. Since only LDS trunk does it, I chose to ignore this extra field.

I didn't add another deployer file for the trusty files, or new deployer targets, because we want to keep this simple for users. If they are confronted with dozens of deployer option, answering "which one do I use?" becomes more complicated. Still, if reviewers want it, I could change that so we get to test both precise and trusty for the time being.

[Adam Collard (adam-collard)]

I tried just running make deploy-dense-maas but immediately hit an issue https://pastebin.canonical.com/115984/

The -u to deployer looks suspicious - can we remove it from this MP please?

review: Needs Fixing

[Andreas Hasenack (ahasenack)]

> I tried just running make deploy-dense-maas but immediately hit an issue
> https://pastebin.canonical.com/115984/
>
> The -u to deployer looks suspicious - can we remove it from this MP please?

Addressed, thanks

[lp:~ahasenack/landscape-charm/landscape-charm-use-trusty]

205. By Andreas Hasenack on 2014-08-27

Can't use -u, because the landscape charm that ends up in the temporary
directory we use is not a branch.

[Adam Collard (adam-collard)]

LGTM! +1

Did a deployment on dense maas and confirmed things looked ok with a basic (manual) smoke test

review: Approve

[David Britton (dpb)]

"I also added a flag, enabled by default, to update all charms before running the charm integration tests."

I don't see this in the diff?

[David Britton (dpb)]

> "I also added a flag, enabled by default, to update all charms before running
> the charm integration tests."
>
> I don't see this in the diff?

Ignore. (Thanks Adam)

[Chris Glass (tribaal)]

Looks good! +1

review: Approve

=== modified file 'config/landscape-deployments.yaml'
--- config/landscape-deployments.yaml	2014-07-29 17:14:04 +0000
+++ config/landscape-deployments.yaml	2014-08-27 16:03:23 +0000
@@ -1,9 +1,9 @@
 _common:
     services:
         rabbitmq-server:
-            charm: cs:precise/rabbitmq-server-28
+            charm: cs:trusty/rabbitmq-server-4
         postgresql:
-            charm: cs:precise/postgresql-74
+            charm: cs:trusty/postgresql-3
             constraints: mem=2048
             options:
                 extra-packages: python-apt postgresql-contrib postgresql-.*-debversion
@@ -18,7 +18,7 @@
                 # Don't deploy default haproxy service on port 80
                 services: ""
         apache2:
-            charm: cs:precise/apache2-24
+            charm: cs:trusty/apache2-4
             expose: True
             options:
                 enable_modules: proxy proxy_http proxy_balancer rewrite expires headers ssl
@@ -28,7 +28,7 @@
 
 landscape:
     inherits: _common
-    series: precise
+    series: trusty
     services:
         landscape:
             branch: lp:~landscape/landscape-charm/stable

=== modified file 'dev/update-charm-revision-numbers'
--- dev/update-charm-revision-numbers	2014-05-23 20:51:15 +0000
+++ dev/update-charm-revision-numbers	2014-08-27 16:03:23 +0000
@@ -50,10 +50,10 @@
     be tested and checked in if successful.
 
     Look for lines like:
-      charm: cs:precise/juju-gui-83
+      charm: cs:trusty/juju-gui-83
 
     Or:
-      series: precise
+      series: trusty
     """
     filename = "config/landscape-deployments.yaml"
     for line in fileinput.input(filename, inplace=1):
@@ -73,7 +73,7 @@
     description = "Put new charmstore descriptors into a deployer file."
     parser = argparse.ArgumentParser(description=description)
     parser.add_argument("charms", help="List charms to update", nargs='*')
-    parser.add_argument("--series", help="Charm series", default="precise")
+    parser.add_argument("--series", help="Charm series", default="trusty")
     return parser.parse_args()
 
 

=== modified file 'tests/01-begin'
--- tests/01-begin	2014-07-16 20:25:25 +0000
+++ tests/01-begin	2014-08-27 16:03:23 +0000
@@ -232,7 +232,7 @@
         Specifically that it is reachable and that it responds
         correctly to requests.
         """
-        good_content = "ds8:messagesl;s11:server-uuid"
+        good_content = ["ds8:messagesl", "s11:server-uuid"]
         post_data = ("ds8:messagesl;s22:next-expected-sequencei0;s8:"
                      "sequencei0;;")
         header = "X-MESSAGE-API: 3.1"