Tushar Gupta has proposed merging
~tushar5526/launchpad-mojo-specs/+git/private:remove-bos01-resources-on-production
into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~tushar5526/launchpad-mojo-specs/+git/private/+merge/477428
--
Your team Launchpad code reviewers is requested to review the proposed merge of
~tushar5526/launchpad-mojo-specs/+git/private:remove-bos01-resources-on-production
into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.
diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index 94af167..5288d2b 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -3,23 +3,19 @@
{%- if stage_name == "production" %}
{%- set clamav_database_url = "http://clamav-database-mirror.lp.internal/"; %}
{%- set content_id_template = "launchpad-buildd:production" %}
-{%- set dns_update_host_bos01 = "10.189.0.2" %}
-{%- set dns_update_host_bos02 = "10.189.128.2" %}
+ {%- set dns_update_host_bos02 = "10.189.128.2" %}
{%- set dns_update_host_bos03 = "10.189.128.2" %}
{%- set dns_update_host_lcy02 = "10.131.53.11 10.131.53.12 10.131.53.13" %}
{%- set dns_update_key_name = "vbuilder-manage" %}
-{%- set domain_bos01 = "vbuilder.bos01.scalingstack" %}
{%- set domain_bos02 = "vbuilder.bos02.scalingstack" %}
{%- set domain_bos03 = "vbuilder.bos03.scalingstack" %}
{%- set domain_lcy02 = "vbuilder.lcy02.scalingstack" %}
{%- set extra_constraints = "root-disk-source=volume" %}
{%- set gss_series = "focal|jammy" %}
{%- set gss_series_with_noble = gss_series + "|noble" %}
-{%- set instance_key_name_bos01 = "vbuilder-manage-bos01" %}
{%- set instance_key_name_bos02 = "vbuilder-manage-bos02" %}
{%- set instance_key_name_bos03 = "vbuilder-manage-bos03" %}
{%- set instance_key_name_lcy02 = "vbuilder-manage-lcy02" %}
-{%- set instance_network_bos01 = "10.189.16.0/20" %}
{%- set instance_network_bos02 = "10.189.144.0/20" %}
{%- set instance_network_bos03 = "10.143.0.0/20" %}
{%- set instance_network_lcy02 = "10.133.0.0/16" %}
@@ -37,7 +33,6 @@
The image modifiers run on amd64 by default, so the `modifiers_XXX` variables
will only be relevant for the remaining archs.
#}
-{%- set modifiers_bos01 = '{"arm64": "10.43.0.29", "ppc64el": "10.43.0.36"}' %}
{%- set modifiers_bos02 = '{"arm64": "10.44.0.22", "ppc64el": "10.44.0.20"}' %}
{%- set modifiers_bos03 = '{"arm64": "10.143.254.129", "ppc64el": "10.143.254.194", "riscv64": "10.143.254.223", "s390x": "10.143.254.18"}' %}
{%- set name_prefix = "launchpad-buildd" %}
@@ -47,7 +42,6 @@
{%- set openstack_username = "vbuilder" %}
{%- set openstack_username_bos03 = "launchpad-vbuilder-production" %}
{%- set openstack_username_lcy02 = "launchpad-vbuilder-production" %}
-{%- set vbuilders_bos01 = {"arm64-gpu": {"arch_base": "arm64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-nvidia-l4", "count": 2, "config_drive": false}} %}
{%- set vbuilders_bos02 = {} %}
{%- set vbuilders_bos03 = {"amd64": {"series": "noble", "count": 60}, "amd64-gpu": {"arch_base": "amd64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-gpu", "count": 12}, "arm64": {"series": "noble", "count": 120, "config_drive": false, "flavor": "vbuilder-arm64"}, "arm64-gpu": {"arch_base": "arm64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-arm64-gpu", "count": 3}, "ppc64el": {"series": "focal", "count": 50, "config_drive": false, "flavor": "vbuilder-ppc64el"}, "riscv64": {"series": "noble", "count": 60, "config_drive": false}, "s390x": {"series": "focal", "count": 40, "config_drive": false, "flavor": "vbuilder-s390x"}} %}
{%- set vbuilders_lcy02 = {"amd64": {"series": "noble", "count": 120}} %}
@@ -160,25 +154,6 @@ applications:
charm: ch:rabbitmq-server
constraints: "cores=2 mem=8G root-disk=20G {{ extra_constraints }}"
num_units: 2
-{%- if stage_name in ("production") %}
- glance-simplestreams-sync-bos01-arm64-gpu:
- charm: {{ charm_dir }}/glance-simplestreams-sync
- constraints: "{{ extra_constraints }}"
- num_units: 1
- options:
- content_id_template: "{{ content_id_template }}:gpu"
- custom_properties: 'hypervisor_type=kvm hw_firmware_type=uefi'
- 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~(arm64|aarch64)", "ftype~(disk1.img|disk.img)"]}]
- name_prefix: "{{ name_prefix }}-gpu/"
- 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
-{%- endif %}
glance-simplestreams-sync-bos03-amd64:
charm: {{ charm_dir }}/glance-simplestreams-sync
constraints: "{{ extra_constraints }}"
@@ -320,18 +295,6 @@ applications:
clamav-database-url: "{{ clamav_database_url }}"
launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
-{%- if stage_name in ("production") %}
- launchpad-buildd-image-modifier-bos01-arm64-gpu:
- charm: {{ charm_dir }}/launchpad-buildd-image-modifier
- options:
- clamav-database-url: "{{ clamav_database_url }}"
- extra-packages: "nvidia-headless-525-server nvidia-utils-525-server"
- launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
- linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false compat_uts_machine=armv7l"
- 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
-{% endif %}
launchpad-buildd-image-modifier-bos03-amd64:
charm: {{ charm_dir }}/launchpad-buildd-image-modifier
options:
@@ -400,32 +363,6 @@ applications:
remote-modifiers: '{{ modifiers_bos03 }}'
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 in ("production") %}
- vbuilder-manage-bos01:
- 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-bos01
- amqp-vhost: vbuilder-manage-bos01
- celery-worker-count: "32"
- dns-update-host: "{{ dns_update_host_bos01 }}"
- dns-update-key-name: "{{ dns_update_key_name }}"
- domain: "{{ domain_bos01 }}"
- instance-key-name: "{{ instance_key_name_bos01 }}"
- instance-network: "{{ instance_network_bos01 }}"
- 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.bos01.scalingstack:5000/v3
- openstack-identity-api-version: "3"
- openstack-tenant-name: "{{ openstack_tenant_name }}"
- openstack-username: "{{ openstack_username }}"
- vbuilders: '{{ vbuilders("bos01", vbuilders_bos01) }}'
-{% endif %}
vbuilder-manage-bos03:
charm: {{ charm_dir }}/vbuilder-manage
constraints: "cores=4 mem=8G root-disk=50G {{ extra_constraints }}"
@@ -499,9 +436,6 @@ applications:
pattern = "/usr/local/sbin/ppa-reset"
install_method: snap
relations:
-{%- if stage_name in ("production") %}
- - ["glance-simplestreams-sync-bos01-arm64-gpu:image-modifier", "launchpad-buildd-image-modifier-bos01-arm64-gpu: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"]
@@ -512,15 +446,9 @@ relations:
- ["glance-simplestreams-sync-bos03-s390x:image-modifier", "launchpad-buildd-image-modifier-bos03-s390x:image-modifier"]
- ["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"]
-{%- if stage_name in ("production") %}
- - ["vbuilder-manage-bos01:amqp", "rabbitmq-server:amqp"]
-{% endif %}
- ["vbuilder-manage-bos03:amqp", "rabbitmq-server:amqp"]
- ["vbuilder-manage-lcy02:amqp", "rabbitmq-server:amqp"]
- ["rabbitmq-server", "ntp"]
-{%- if stage_name in ("production") %}
- - ["glance-simplestreams-sync-bos01-arm64-gpu", "ntp"]
-{% endif %}
- ["glance-simplestreams-sync-bos03-amd64", "ntp"]
- ["glance-simplestreams-sync-bos03-amd64-gpu", "ntp"]
- ["glance-simplestreams-sync-bos03-arm64", "ntp"]
@@ -531,9 +459,6 @@ relations:
- ["glance-simplestreams-sync-bos03-s390x", "ntp"]
- ["glance-simplestreams-sync-bos03-ppc64el", "ntp"]
- ["glance-simplestreams-sync-lcy02-amd64", "ntp"]
-{%- if stage_name in ("production") %}
- - ["vbuilder-manage-bos01", "ntp"]
-{%- endif %}
- ["vbuilder-manage-bos03", "ntp"]
- ["vbuilder-manage-lcy02", "ntp"]
- ["clamav-database-mirror", "ntp"]
_______________________________________________
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : launchpad-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
