Merge lp:~simpoir/landscape-bundles/bionic_support into lp:landscape-bundles

[Simon Poirier]

This branch bumps charms versions to bionic-compatible ones.

This branch bumps charms versions to bionic-compatible ones.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Fail
Revno: 44
Branch: lp:~simpoir/landscape-bundles/bionic_support
Jenkins: https://ci.lscape.net/job/latch-test-trusty/1602/

review: Needs Fixing (test results)

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 44
Branch: lp:~simpoir/landscape-bundles/bionic_support
Jenkins: https://ci.lscape.net/job/latch-test-trusty/1603/

review: Approve (test results)

[Dave Jones (waveform)]

+1

review: Approve

=== modified file 'landscape-template.jinja2'
--- landscape-template.jinja2	2017-03-30 21:18:18 +0000
+++ landscape-template.jinja2	2018-07-12 21:49:30 +0000
@@ -1,7 +1,7 @@
-series: xenial
+series: bionic
 services:
     rabbitmq-server:
-        charm: cs:xenial/rabbitmq-server-5
+        charm: cs:bionic/rabbitmq-server-74
         {% if rabbitmq["to"] %}
         to:
             - {{ rabbitmq["to"] }}
@@ -11,7 +11,7 @@
             "gui-x": "600"
             "gui-y": "370"
     postgresql:
-        charm: cs:xenial/postgresql-101
+        charm: cs:bionic/postgresql-175
         {% if postgresql["memory"] %}
         constraints: mem={{ postgresql["memory"] }}
         {% endif %}
@@ -46,7 +46,7 @@
             "gui-x": "600"
             "gui-y": "120"
     haproxy:
-        charm: cs:xenial/haproxy-41
+        charm: cs:bionic/haproxy-45
         {% if haproxy["to"] %}
         to:
             - "{{ haproxy["to"] }}"

=== modified file 'update-charm-revisions'
--- update-charm-revisions	2016-07-22 17:08:20 +0000
+++ update-charm-revisions	2018-07-12 21:49:30 +0000
@@ -74,7 +74,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="xenial")
+    parser.add_argument("--series", help="Charm series", default="bionic")
     return parser.parse_args()