canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+455443@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:ps5-prod-update-service-bundle into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/455443
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:ps5-prod-update-service-bundle into autopkgtest-cloud:master.

diff --git a/mojo/service-bundle b/mojo/service-bundle
index 030f6f3..b84496f 100644
--- a/mojo/service-bundle
+++ b/mojo/service-bundle
@@ -1,5 +1,5 @@
 {%- if stage_name == "production" %}
-    {%- set releases = "trusty xenial bionic focal jammy lunar mantic noble" %}
+    {%- set releases = "bionic focal jammy lunar mantic noble" %}
     {%- set channel = "latest/stable" %}
 {%- elif stage_name == "staging" or stage_name == "devel" %}
     {%- set releases = "focal jammy lunar mantic" %}
@@ -43,11 +43,14 @@ applications:
 {%- if stage_name == "production" %}
             influxdb-username: prod_proposed_migration
             influxdb-context: production
-            swift-username: prod_proposed-migration
-            swift-region: bootstack-ps45
-            swift-auth-url: http://10.24.0.132:5000/v2.0/
-            swift-tenant: prod_proposed-migration_project
-            swift-auth-version: 2
+            swift-username: prod-proposed-migration-environment
+            swift-region: prodstack5
+            swift-auth-url: https://keystone.ps5.canonical.com:5000/v3
+            swift-tenant: prod-proposed-migration-environment_project
+            swift-auth-version: 3
+            swift-project-domain-name: Default
+            swift-project-name: prod-proposed-migration-environment_project
+            swift-user-domain-name: Default
 {%- elif stage_name == "staging" %}
             influxdb-username: stg_proposed_migration
             influxdb-context: staging
@@ -172,8 +175,8 @@ applications:
         options:
             hostname: {{ hostname }}
 {%- if stage_name == "production" %}
-            {%- set storage_host_internal = "10.24.0.23:8080" %}
-            {%- set storage_path_internal = "/v1/AUTH_55634ac656cc493aabba491b83285166" %}
+            {%- set storage_host_internal = "objectstorage.prodstack5.canonical.com:443" %}
+            {%- set storage_path_internal = "/swift/v1/AUTH_a77cf7d04cc348e3b9aad5180306c3dd" %}
 {%- elif stage_name == "staging" %}
             {%- set storage_host_internal = "10.24.0.23:8080" %}
             {%- set storage_path_internal = "/v1/AUTH_fc846d173967483bb32abd78f66210e8" %}
@@ -181,7 +184,7 @@ applications:
             storage_host_internal: XXX
             storage_path_internal: XXX
 {%- endif %}
-            storage-url-internal: http://{{ storage_host_internal }}{{ storage_path_internal }}
+            storage-url-internal: https://{{ storage_host_internal }}{{ storage_path_internal }}
 {%- if stage_name == "production" or stage_name == "staging" %}
             github-secrets: include-file://{{local_dir}}/github-secrets.json
             github-status-credentials: include-file://{{local_dir}}/github-status-credentials.txt
@@ -247,21 +250,9 @@ applications:
             suffix_cert: ".pem"
             suffix_chain: ".pem"
             suffix_key: ".pem"
-    landscape-client:
-        charm: cs:{{series}}/landscape-client
-        options:
-            url: https://landscape.is.canonical.com/message-system
-            ping-url: http://landscape.is.canonical.com/ping
-            account-name: standalone
-            registration-key: include-file://{{local_dir}}//landscape-registration-key
-            tags: juju-managed, devops-instance, devops-{{stage_name}}, proposed-migration-{{stage_name}}
-    livepatch:
-        charm: cs:canonical-livepatch
-        options:
-            livepatch_key: include-file://{{local_dir}}/canonical-is-livepatch-key
     telegraf:
         charm: telegraf
-        channel: latest/stable
+        channel: stable
         expose: true
         options:
             install_method: snap
@@ -279,20 +270,10 @@ relations:
     - - apache2:website
       - haproxy:reverseproxy
 {%- if stage_name == "production" or stage_name == "staging" %}
-    - ["apache2", "landscape-client"]
-    - ["apache2", "livepatch"]
     - ["apache2:juju-info", "telegraf:juju-info"]
-    - ["autopkgtest-cloud-worker:juju-info", "landscape-client:container"]
-    - ["autopkgtest-cloud-worker:juju-info", "livepatch:juju-info"]
     - ["autopkgtest-cloud-worker:juju-info", "telegraf:juju-info"]
-    - ["autopkgtest-lxd-worker:juju-info", "landscape-client:container"]
-    - ["autopkgtest-lxd-worker:juju-info", "livepatch:juju-info"]
     - ["autopkgtest-lxd-worker:juju-info", "telegraf:juju-info"]
     - ["haproxy", "autocert-haproxy"]
-    - ["haproxy", "landscape-client"]
-    - ["haproxy", "livepatch"]
     - ["haproxy:juju-info", "telegraf:juju-info"]
-    - ["rabbitmq-server", "landscape-client"]
-    - ["rabbitmq-server", "livepatch"]
     - ["rabbitmq-server:juju-info", "telegraf:juju-info"]
-{% endif %}
+{% endif %}
\ No newline at end of file