Merge ~cjwatson/launchpad-mojo-specs:lp-production-internal-rabbitmq into launchpad-mojo-specs:master

[Colin Watson]

lp: Use internal rabbitmq-server for production

While our previous deployment was workable enough, it was deployed in `prod-launchpad-manual-servers` via an IS-maintained bundle, and it would be simpler to move it into our main bundle.

Some migration will need to be done manually; this change will have the effect of deploying new units, but nothing will use them until we update or remove the `rabbitmq_broker_urls` options from `deploy-secrets`.

[Ines Almeida (ines-almeida)]

Makes sense

review: Approve

diff --git a/lp/bundle.yaml b/lp/bundle.yaml
index f8d9803..c33f6ef 100644
--- a/lp/bundle.yaml
+++ b/lp/bundle.yaml
@@ -52,8 +52,6 @@
 {%- set enable_loggerhead = False %}
 {#- If True, external-services/db_connections must be set in secrets. #}
 {%- set external_database = False %}
-{#- If True, launchpad-*/rabbitmq_broker_urls must be set in secrets. #}
-{%- set external_rabbitmq = False %}
 {%- set gpg_upload_keys = False %}
 {%- set haproxy_num_units = 1 %}
 {%- set http_proxy = "http://squid.internal:3128/" %}
@@ -108,6 +106,7 @@
 {%- set ppa_lb_ipv4_address = "" %}
 {%- set ppa_private_base_url_buildd_manager = "http://private-ppa.buildd/" %}
 {%- set process_inbound_email_host = "mail.canonical.com" %}
+{%- set rabbitmq_constraints = "" %}
 {%- set require_signing_keys = False %}
 {%- set signing_endpoint = "" %}
 {%- set snap_store_secrets_public_key = "" %}
@@ -184,7 +183,6 @@
 {%-   set enable_librarian_frontend = True %}
 {%-   set enable_loggerhead = True %}
 {%-   set external_database = True %}
-{%-   set external_rabbitmq = True %}
 {%-   set gpg_upload_keys = True %}
 {%-   set haproxy_num_units = 2 %}
 {%-   set internal_branch_by_id_root = "http://bazaar.lp.internal:8081/" %}
@@ -269,6 +267,8 @@
 {%-   set port_main = 10001 %}
 {%-   set port_xmlrpc = 8097 %}
 {%-   set process_inbound_email_username = "launchpad" %}
+{%-   set rabbitmq_constraints = "cores=4 mem=8G root-disk=50G root-disk-source=local" %}
+{%-   set rabbitmq_num_units = 3 %}
 {%-   set rabbitmq_user = "production-juju" %}
 {%-   set require_signing_keys = True %}
 {%-   set services_lb_constraints = "cores=4 mem=4096M root-disk-source=volume root-disk=50G" %}
@@ -1572,11 +1572,11 @@ applications:
 {%- else %}
     num_units: 2
 {%- endif %}
-{%- if not external_rabbitmq %}
   rabbitmq-server:
     charm: ch:rabbitmq-server
     channel: stable
     revision: 123
+    constraints: "{{ rabbitmq_constraints }}"
     num_units: {{ rabbitmq_num_units }}
     options:
       check-vhosts: "{{ domain }}"
@@ -1587,7 +1587,6 @@ applications:
         - ['{{ domain }}', 'job', 780, 800]
         - ['{{ domain }}', \'oops*\', 5000, 10000]
         - [\'*\', \'*\', 100, 200]
-{%- endif %}
 {%- if stage_name == "production" %}
   postfix-relay:
     charm: ch:postfix-relay
@@ -1740,7 +1739,6 @@ applications:
     expose: true
     options:
       install_method: snap
-{%- if not external_rabbitmq %}
   telegraf-rabbitmq-server:
     charm: ch:telegraf
     channel: stable
@@ -1749,7 +1747,6 @@ applications:
     options:
       install_method: snap
 {%- endif %}
-{%- endif %}
 relations:
 {%- if enable_appserver_frontends %}
 {%- if not devel %}
@@ -1870,7 +1867,6 @@ relations:
 {%- if enable_launchpad_scripts_bzrsyncd %}
   - ["launchpad-scripts-bzrsyncd", "memcached"]
 {%- endif %}
-{%- if not external_rabbitmq %}
   - ["launchpad-admin", "rabbitmq-server"]
   - ["launchpad-appserver", "rabbitmq-server"]
 {%- if enable_buildd_manager %}
@@ -1906,7 +1902,6 @@ relations:
 {%- if enable_launchpad_codehosting %}
   - ["launchpad-codehosting", "rabbitmq-server"]
 {%- endif %}
-{%- endif %}
 {%- if stage_name == "production" %}
   - ["postfix-relay", "launchpad-admin"]
   - ["postfix-relay", "launchpad-appserver"]
@@ -1995,9 +1990,7 @@ relations:
   - ["nrpe:nrpe-external-master", "postgresql:nrpe-external-master"]
 {%- endif %}
   - ["nrpe:nrpe-external-master", "memcached:nrpe-external-master"]
-{%- if not external_rabbitmq %}
   - ["nrpe", "rabbitmq-server"]
-{%- endif %}
 {%- if not devel %}
 {%- if enable_appserver_frontends %}
   - ["telegraf", "frontend-main:juju-info"]
@@ -2070,8 +2063,6 @@ relations:
 {%- endif %}
   - ["telegraf-memcached:juju-info", "memcached:juju-info"]
   - ["telegraf-memcached:memcached", "memcached:cache"]
-{%- if not external_rabbitmq %}
   - ["telegraf-rabbitmq-server:juju-info", "rabbitmq-server:juju-info"]
   - ["telegraf-rabbitmq-server:amqp", "rabbitmq-server:amqp"]
 {%- endif %}
-{%- endif %}