launchpad-reviewers team mailing list archive

[Guruprasad <mp+474710@xxxxxxxxxxxxxxxxxx>]

Guruprasad has proposed merging ~lgp171188/launchpad-mojo-specs/+git/private:remove-last-bos01-bos02-ppc64el-config into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

Commit message:
vbuilder: Remove last traces of ppc64el in bos01, bos02

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~lgp171188/launchpad-mojo-specs/+git/private/+merge/474710
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad-mojo-specs/+git/private:remove-last-bos01-bos02-ppc64el-config into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index 0f875d7..1e241ec 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -199,41 +199,6 @@ applications:
       region: scalingstack-bos01
       use_swift: false
       visibility: private
-{%- if stage_name == "production" %}
-  glance-simplestreams-sync-bos01-ppc64el:
-    charm: {{ charm_dir }}/glance-simplestreams-sync
-    constraints: "{{ extra_constraints }}"
-    num_units: 1
-    options:
-      content_id_template: "{{ content_id_template }}"
-      custom_properties: 'hypervisor_type=kvm'
-      mirror_list: |-
-        [{url: "http://cloud-images.ubuntu.com/daily/";, name_prefix: "ubuntu:released", path: "streams/v1/index.sjson", max: 2, item_filters: ["release~({{ gss_series }})", "arch~(ppc64el)", "ftype~(disk1.img|disk.img)"]}]
-      name_prefix: "{{ name_prefix }}/"
-      openstack-auth-url: "http://keystone.infra.bos01.scalingstack:5000/v3";
-      openstack-identity-api-version: "3"
-      openstack-tenant-name: "{{ openstack_tenant_name }}"
-      openstack-username: "{{ openstack_username }}"
-      region: scalingstack-bos01
-      use_swift: false
-      visibility: private
-  glance-simplestreams-sync-bos02-ppc64el:
-    charm: {{ charm_dir }}/glance-simplestreams-sync
-    constraints: "{{ extra_constraints }}"
-    num_units: 1
-    options:
-      content_id_template: "{{ content_id_template }}"
-      custom_properties: 'hypervisor_type=kvm'
-      mirror_list: |-
-        [{url: "http://cloud-images.ubuntu.com/daily/";, name_prefix: "ubuntu:released", path: "streams/v1/index.sjson", max: 2, item_filters: ["release~({{ gss_series }})", "arch~(ppc64el)", "ftype~(disk1.img|disk.img)"]}]
-      name_prefix: "{{ name_prefix }}/"
-      openstack-auth-url: "http://keystone.infra.bos02.scalingstack:5000/v2.0";
-      openstack-tenant-name: "{{ openstack_tenant_name }}"
-      openstack-username: "{{ openstack_username }}"
-      region: scalingstack-bos02
-      use_swift: false
-      visibility: private
-{%- endif %}
   glance-simplestreams-sync-bos03-amd64:
     charm: {{ charm_dir }}/glance-simplestreams-sync
     constraints: "{{ extra_constraints }}"
@@ -379,26 +344,6 @@ applications:
       remote-modifiers: '{{ modifiers_bos01 }}'
       remote-modifier-private-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder
       remote-modifier-public-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder.pub
-{%- if stage_name == "production" %}
-  launchpad-buildd-image-modifier-bos01-ppc64el:
-    charm: {{ charm_dir }}/launchpad-buildd-image-modifier
-    options:
-      clamav-database-url: "{{ clamav_database_url }}"
-      launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
-      linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
-      remote-modifiers: '{{ modifiers_bos01 }}'
-      remote-modifier-private-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder
-      remote-modifier-public-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder.pub
-  launchpad-buildd-image-modifier-bos02-ppc64el:
-    charm: {{ charm_dir }}/launchpad-buildd-image-modifier
-    options:
-      clamav-database-url: "{{ clamav_database_url }}"
-      launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
-      linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
-      remote-modifiers: '{{ modifiers_bos02 }}'
-      remote-modifier-private-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder
-      remote-modifier-public-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder.pub
-{%- endif %}
   launchpad-buildd-image-modifier-bos03-amd64:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
@@ -486,29 +431,6 @@ applications:
       openstack-tenant-name: "{{ openstack_tenant_name }}"
       openstack-username: "{{ openstack_username }}"
       vbuilders: '{{ vbuilders("bos01", vbuilders_bos01) }}'
-  vbuilder-manage-bos02:
-    charm: {{ charm_dir }}/vbuilder-manage
-    constraints: "cores=2 mem=8G root-disk=20G {{ extra_constraints }}"
-    expose: true
-    num_units: 1
-    options:
-      amqp-username: vbuilder-manage-bos02
-      amqp-vhost: vbuilder-manage-bos02
-      celery-worker-count: "50"
-      dns-update-host: "{{ dns_update_host_bos02 }}"
-      dns-update-key-name: "{{ dns_update_key_name }}"
-      domain: "{{ domain_bos02 }}"
-      instance-key-name: "{{ instance_key_name_bos02 }}"
-      instance-network: "{{ instance_network_bos02 }}"
-      instance-router: "{{ instance_router }}"
-      log-hosts-allow: "{{ log_hosts_allow }}"
-      lp-buildd-managers: "{{ lp_buildd_managers }}"
-      lp-environment: "{{ lp_environment }}"
-      lp-sshkey: "{{ lp_sshkey }}"
-      openstack-auth-url: http://keystone.infra.bos02.scalingstack:5000/v2.0
-      openstack-tenant-name: "{{ openstack_tenant_name }}"
-      openstack-username: "{{ openstack_username }}"
-      vbuilders: '{{ vbuilders("bos02", vbuilders_bos02) }}'
   vbuilder-manage-bos03:
     charm: {{ charm_dir }}/vbuilder-manage
     constraints: "cores=4 mem=8G root-disk=50G {{ extra_constraints }}"
@@ -584,10 +506,6 @@ applications:
 relations:
   - ["glance-simplestreams-sync-bos01-amd64:image-modifier", "launchpad-buildd-image-modifier-bos01-amd64:image-modifier"]
   - ["glance-simplestreams-sync-bos01-arm64-gpu:image-modifier", "launchpad-buildd-image-modifier-bos01-arm64-gpu:image-modifier"]
-{%- if stage_name == "production" %}
-  - ["glance-simplestreams-sync-bos01-ppc64el:image-modifier", "launchpad-buildd-image-modifier-bos01-ppc64el:image-modifier"]
-  - ["glance-simplestreams-sync-bos02-ppc64el:image-modifier", "launchpad-buildd-image-modifier-bos02-ppc64el:image-modifier"]
-{%- endif %}
   - ["glance-simplestreams-sync-bos03-amd64:image-modifier", "launchpad-buildd-image-modifier-bos03-amd64:image-modifier"]
   - ["glance-simplestreams-sync-bos03-amd64-gpu:image-modifier", "launchpad-buildd-image-modifier-bos03-amd64-gpu:image-modifier"]
   - ["glance-simplestreams-sync-bos03-arm64:image-modifier", "launchpad-buildd-image-modifier-bos03-arm64:image-modifier"]
@@ -598,16 +516,11 @@ relations:
   - ["glance-simplestreams-sync-bos03-ppc64el:image-modifier", "launchpad-buildd-image-modifier-bos03-ppc64el:image-modifier"]
   - ["glance-simplestreams-sync-lcy02-amd64:image-modifier", "launchpad-buildd-image-modifier-amd64:image-modifier"]
   - ["vbuilder-manage-bos01:amqp", "rabbitmq-server:amqp"]
-  - ["vbuilder-manage-bos02:amqp", "rabbitmq-server:amqp"]
   - ["vbuilder-manage-bos03:amqp", "rabbitmq-server:amqp"]
   - ["vbuilder-manage-lcy02:amqp", "rabbitmq-server:amqp"]
   - ["rabbitmq-server", "ntp"]
   - ["glance-simplestreams-sync-bos01-amd64", "ntp"]
   - ["glance-simplestreams-sync-bos01-arm64-gpu", "ntp"]
-{%- if stage_name == "production" %}
-  - ["glance-simplestreams-sync-bos01-ppc64el", "ntp"]
-  - ["glance-simplestreams-sync-bos02-ppc64el", "ntp"]
-{%- endif %}
   - ["glance-simplestreams-sync-bos03-amd64", "ntp"]
   - ["glance-simplestreams-sync-bos03-amd64-gpu", "ntp"]
   - ["glance-simplestreams-sync-bos03-arm64", "ntp"]
@@ -618,7 +531,6 @@ relations:
   - ["glance-simplestreams-sync-bos03-ppc64el", "ntp"]
   - ["glance-simplestreams-sync-lcy02-amd64", "ntp"]
   - ["vbuilder-manage-bos01", "ntp"]
-  - ["vbuilder-manage-bos02", "ntp"]
   - ["vbuilder-manage-bos03", "ntp"]
   - ["vbuilder-manage-lcy02", "ntp"]
   - ["clamav-database-mirror", "ntp"]