Merge lp:~simpoir/landscape-bundles/bumpitty-bump into lp:landscape-bundles

[Simon Poirier]

Fix update-charm-revisions regexp to match current charm Id scheme and bump charms revision.

update-charm-revisions regexp to match current charm Id scheme.

Also bump charms.
This should include this rabbitmq-server HA race condition fix
(https://opendev.org/openstack/charm-rabbitmq-server/commit/dcb3058ff2b730f573329c32a85381a05bd743d3)

thus removing the HA oddities of this related MP
https://code.launchpad.net/~simpoir/landscape-charm/1501803_ha_amqp/+merge/406052

[Maximiliano Bertacchini (maxiberta)]

+1

review: Approve

=== modified file 'landscape-template.jinja2'
--- landscape-template.jinja2	2019-04-05 10:20:26 +0000
+++ landscape-template.jinja2	2021-07-22 23:23:12 +0000
@@ -1,7 +1,7 @@
 series: bionic
 services:
     rabbitmq-server:
-        charm: cs:rabbitmq-server-85
+        charm: cs:rabbitmq-server-111
         {% if rabbitmq["to"] %}
         to:
             - {{ rabbitmq["to"] }}
@@ -11,7 +11,7 @@
             "gui-x": "600"
             "gui-y": "370"
     postgresql:
-        charm: cs:postgresql-199
+        charm: cs:postgresql-234
         {% if postgresql["memory"] %}
         constraints: mem={{ postgresql["memory"] }}
         {% endif %}
@@ -46,7 +46,7 @@
             "gui-x": "600"
             "gui-y": "120"
     haproxy:
-        charm: cs:haproxy-48
+        charm: cs:haproxy-61
         {% if haproxy["to"] %}
         to:
             - "{{ haproxy["to"] }}"
 
=== modified file 'update-charm-revisions'
--- update-charm-revisions	2019-04-05 12:51:18 +0000
+++ update-charm-revisions	2021-07-22 23:23:12 +0000
@@ -51,7 +51,7 @@
     be tested and checked in if successful.
 
     Look for lines like:
-      charm: cs:trusty/juju-gui-83
+      charm: cs:juju-gui-83
 
     Or:
       series: trusty
@@ -60,7 +60,7 @@
         pattern = "^(\s*)series:\s.*$"
         line = re.sub(pattern, r"\1series: %s" % series, line)
         for charm in charms:
-            pattern = "cs:[^/]+/{}-[0-9]+".format(charm.name)
+            pattern = "cs:{}-[0-9]+".format(charm.name)
             line = re.sub(pattern, charm.store_url, line)
         sys.stdout.write(line)