launchpad-reviewers team mailing list archive

[Alvaro Crespo Serrano <mp+484153@xxxxxxxxxxxxxxxxxx>]

Addressed all comments

Diff comments:

> diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
> index 19eb047..709d074 100644
> --- a/vbuilder/bundle.yaml
> +++ b/vbuilder/bundle.yaml
> @@ -101,18 +101,22 @@
>  {%-   set domain_bos02 = "vbuilder.qastaging.bos02.scalingstack" %}
>  {%-   set domain_bos03 = "vbuilder.qastaging.bos03.scalingstack" %}
>  {%-   set domain_lcy02 = "vbuilder.qastaging.lcy02.scalingstack" %}
> +{%-   set domain_sto01 = "vbuilder.qastaging.sto01.scalingstack" %}
>  {%-   set extra_constraints = "" %}
>  {%-   set gss_series = "focal|jammy" %}
>  {%-   set gss_series_with_noble = gss_series + "|noble" %}
>  {%-   set instance_key_name_bos02 = "ppa-manage-test-qastaging" %}
>  {%-   set instance_key_name_bos03 = "ppa-manage-test-qastaging" %}
>  {%-   set instance_key_name_lcy02 = "ppa-manage-test-qastaging" %}
> +{%-   set instance_key_name_sto01 = "ppa-manage-test-qastaging"}

Good catch, added the % at the end of line

>  {%-   set instance_network_bos02 = "10.189.164.0/23" %}
>  {%-   set instance_network_bos03 = "10.144.4.0/23" %}
>  {%-   set instance_network_lcy02 = "10.134.4.0/23" %}
> +{%-   set instance_network_sto01 = "XXXXXXXXXXXXX" %}
>  {%-   set instance_router = "vbuilder_staging_router" %}
>  {%-   set instance_router_bos03 = "router_launchpad-vbuilder-staging" %}
>  {%-   set instance_router_lcy02 = "router_launchpad-vbuilder-staging" %}
> +{%-   set instance_router_sto01 = "router_launchpad-vbuilder-staging" %}
>  {#-   Output of "openstack image show -c id -f value qemu-riscv64-uboot". #}
>  {%-   set kernel_id_bos03_riscv64 = "bcbb013b-9424-4f61-9fda-6374d29d3ee0" %}
>  {%-   set launchpad_buildd_repository = "ppa:launchpad/buildd-staging" %}
> @@ -121,13 +125,16 @@
>  {%-   set lp_sshkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFrjt0yytzrK9fQuG+6VgE6QStUbDmunlN7+Lv5XhmoL stg-launchpad@launchpad-bastion-ps5" %}
>  {%-   set modifiers_bos02 = '{"arm64": "10.44.0.13"}' %}
>  {%-   set modifiers_bos03 = '{"amd64": "10.144.0.206", "arm64": "10.144.0.127", "arm64_gpu": "10.144.0.73", "ppc64el": "10.144.0.110", "riscv64": "10.144.0.114", "s390x": "10.144.0.47"}' %}
> +{%-   set modifiers_sto01 = '{"amd64": "XXXXXXXXXX"}' %}

Changed to an empty dict

>  {%-   set name_prefix = "launchpad-buildd-qastaging" %}
>  {%-   set openstack_tenant_name = "vbuilder_staging_project" %}
>  {%-   set openstack_tenant_name_bos03 = "launchpad-vbuilder-staging_project" %}
>  {%-   set openstack_tenant_name_lcy02 = "launchpad-vbuilder-staging_project" %}
> +{%-   set openstack_tenant_name_sto01= "launchpad-vbuilder-staging_project" %}
>  {%-   set openstack_username = "vbuilder_staging" %}
>  {%-   set openstack_username_bos03 = "launchpad-vbuilder-staging" %}
>  {%-   set openstack_username_lcy02 = "launchpad-vbuilder-staging" %}
> +{%-   set openstack_username_sto01 = "launchpad-vbuilder-staging" %}
>  {%-   set vbuilders_bos02 = {} %}
>  {%-   set vbuilders_bos03 = {"amd64": {"series": "noble", "flavor": "vbuilder-large", "count": 4}, "amd64-gpu": {"arch_base": "amd64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-gpu-large", "count": 1}, "arm64": {"series": "noble", "count": 1, "config_drive": false, "flavor": "vbuilder-arm64-large"}, "arm64-gpu": {"arch_base": "arm64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-arm64-gpu-large", "count": 1}, "ppc64el": {"series": "focal", "count": 3, "config_drive": false, "flavor": "vbuilder-ppc64el-large"}, "riscv64": {"series": "noble", "flavor": "vbuilder-large", "count": 1, "config_drive": false}, "s390x": {"series": "focal", "count": 3, "config_drive": false, "flavor": "vbuilder-s390x-large"}} %}
>  {%-   set vbuilders_lcy02 = {"amd64": {"series": "noble", "count": 4}} %}
> @@ -220,6 +227,23 @@ applications:
>        region: scalingstack-bos03
>        use_swift: false
>        visibility: private
> +  glance-simplestreams-sync-sto01-amd64:
> +    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: 3, item_filters: ["release~({{ gss_series_with_noble }})", "arch~(amd64)", "ftype~(disk1.img|disk.img)"]}]
> +      name_prefix: "{{ name_prefix }}/"
> +      openstack-auth-url: "https://keystone.ps6.canonical.com:5000/v3";

replaced 'ps6' with 'ps7'

> +      openstack-identity-api-version: "3"
> +      openstack-tenant-name: "{{ openstack_tenant_name_sto01 }}"
> +      openstack-username: "{{ openstack_username_sto01 }}"
> +      region: scalingstack-sto01
> +      use_swift: false
> +      visibility: private
>  {%- if stage_name in ("production", "qastaging") %}
>    glance-simplestreams-sync-bos03-riscv64:
>      charm: {{ charm_dir }}/glance-simplestreams-sync


-- 
https://code.launchpad.net/~alvarocs/launchpad-mojo-specs/+git/private/+merge/484153
Your team Launchpad code reviewers is subscribed to branch ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.