From 20c0340c3cb04d323351a30a22e4c4c33b7d0f63 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 11 Sep 2018 10:59:51 +1000 Subject: [PATCH] Add Linaro London cloud The Linaro London cloud runs as a separate entity to the existing cloud, so add it separately. Change-Id: Ia263034de4c8d1ac52f4521d4c82374b06a68e68 --- playbooks/clouds_layouts.yml | 22 +++++++++++++++++++ .../clouds/bridge_all_clouds.yaml.j2 | 20 +++++++++++++++++ .../templates/clouds/bridge_clouds.yaml.j2 | 10 +++++++++ .../templates/clouds/nodepool_clouds.yaml.j2 | 11 ++++++++++ .../templates/group_vars/nodepool.yaml.j2 | 3 +++ .../host_vars/bridge.openstack.org.yaml.j2 | 6 +++++ 6 files changed, 72 insertions(+) diff --git a/playbooks/clouds_layouts.yml b/playbooks/clouds_layouts.yml index 8ed29b1d6b..d464f437e0 100644 --- a/playbooks/clouds_layouts.yml +++ b/playbooks/clouds_layouts.yml @@ -360,6 +360,28 @@ clouds: profiles: - openstackci-keypairs - openstackci-security + - name: openstackci-linaro-london + oscc_cloud: openstackci-linaro-london + region_name: London + profiles: + - openstackci-keypairs + - openstackci-security + images: + - name: ubuntu-xenial + download_image_url: https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-arm64-uefi1.img + download_image_dest: /tmp/ubuntu-xenial-aarch64-uefi.img + filename: /tmp/ubuntu-xenial-aarch64-uefi.img + properties: + hw_firmware_type: uefi + os_command_line: console=ttyAMA0 + hw_disk_bus: scsi + hw_scsi_model: virtio-scsi + - name: openstackzuul-linaro-london + oscc_cloud: openstackzuul-linaro-london + region_name: London + profiles: + - openstackci-keypairs + - openstackci-security - name: openstackci-limestone oscc_cloud: openstackci-limestone region_name: RegionOne diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 index fb2a827145..0fd771263f 100644 --- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 @@ -164,6 +164,26 @@ clouds: project_name: '{{ clouds.openstackzuul_linaro_project_name }}' project_domain_name: default user_domain_name: default + openstackci-linaro-london: + regions: + - London + auth: + auth_url: https://uk.linaro.cloud:5000 + username: '{{ clouds.openstackci_linaro_london_username }}' + password: '{{ clouds.openstackci_linaro_london_password }}' + project_name: '{{ clouds.openstackci_linaro_london_project_name }}' + project_domain_name: default + user_domain_name: default + openstackzuul-linaro-london: + regions: + - London + auth: + auth_url: https://uk.linaro.cloud:5000 + username: '{{ clouds.openstackzuul_linaro_london_username }}' + password: '{{ clouds.openstackzuul_linaro_london_password }}' + project_name: '{{ clouds.openstackzuul_linaro_london_project_name }}' + project_domain_name: default + user_domain_name: default openstackci-limestone: regions: - name: RegionOne diff --git a/playbooks/templates/clouds/bridge_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_clouds.yaml.j2 index 06e49f95ce..4e52c4487c 100644 --- a/playbooks/templates/clouds/bridge_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_clouds.yaml.j2 @@ -94,6 +94,16 @@ clouds: project_name: '{{ clouds.openstackci_linaro_project_name }}' project_domain_name: default user_domain_name: default + openstackci-linaro-london: + regions: + - London + auth: + auth_url: https://uk.linaro.cloud:5000 + username: '{{ clouds.openstackci_linaro_london_username }}' + password: '{{ clouds.openstackci_linaro_london_password }}' + project_name: '{{ clouds.openstackci_linaro_london_project_name }}' + project_domain_name: default + user_domain_name: default openstackci-limestone: regions: - name: RegionOne diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 index 0f833cb957..8d66e163f0 100644 --- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 +++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 @@ -94,6 +94,17 @@ clouds: project_name: '{{ nodepool_linaro_project }}' project_domain_name: default user_domain_name: default + linaro-london: + regions: + - London + identity_api_version: '3' + auth: + auth_url: https://uk.linaro.cloud:5000 + username: '{{ nodepool_linaro_london_username }}' + password: '{{ nodepool_linaro_london_password }}' + project_name: '{{ nodepool_linaro_london_project }}' + project_domain_name: default + user_domain_name: default limestone: regions: - name: RegionOne diff --git a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 index 4d63119fc2..100bad1318 100644 --- a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 @@ -16,6 +16,9 @@ nodepool_citycloud_password: password nodepool_linaro_username: user nodepool_linaro_password: password nodepool_linaro_project: project +nodepool_linaro_london_username: user +nodepool_linaro_london_password: password +nodepool_linaro_london_project: project nodepool_limestone_username: user nodepool_limestone_password: password nodepool_limestone_project: project diff --git a/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 b/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 index 37fc5bcbc7..80cbfc5deb 100644 --- a/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 +++ b/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 @@ -34,6 +34,12 @@ clouds: openstackzuul_linaro_username: user openstackzuul_linaro_password: password openstackzuul_linaro_project_name: project + openstackci_linaro_london_username: user + openstackci_linaro_london_password: password + openstackci_linaro_london_project_name: project + openstackzuul_linaro_london_username: user + openstackzuul_linaro_london_password: password + openstackzuul_linaro_london_project_name: project openstackci_limestone_username: user openstackci_limestone_password: password openstackci_limestone_project_name: project