From dc65009eaf3ee6f2d59e9bce994d771205371f4d Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 17 Dec 2021 07:39:45 +1100 Subject: [PATCH] nodepool: Remove . from openEuler name We have a bug uploading images with "." in the name. Work around this for now by avoid it. Change-Id: I20e1a926d02a632450b8114d84a0fa738b7ec639 --- nodepool/nb03.opendev.org.yaml | 6 +++--- nodepool/nl01.opendev.org.yaml | 10 +++++----- nodepool/nl03.opendev.org.yaml | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/nodepool/nb03.opendev.org.yaml b/nodepool/nb03.opendev.org.yaml index 8071aa0c87..814aceeb07 100644 --- a/nodepool/nb03.opendev.org.yaml +++ b/nodepool/nb03.opendev.org.yaml @@ -65,7 +65,7 @@ providers: os_command_line: "console=ttyAMA0" hw_disk_bus: scsi hw_scsi_model: virtio-scsi - - name: openEuler-20.03-LTS-SP2-arm64 + - name: openEuler-20-03-LTS-SP2-arm64 pause: false config-drive: true meta: @@ -169,11 +169,11 @@ diskimages: env-vars: DIB_EPEL_DISABLED: '1' - - name: openEuler-20.03-LTS-SP2-arm64 + - name: openEuler-20-03-LTS-SP2-arm64 parent: base python-path: /usr/bin/python3 elements: - openeuler-minimal release: 20.03-LTS-SP2 env-vars: - DIB_DISTRIBUTION_MIRROR: 'http://mirror.regionone.linaro-us.opendev.org/openeuler/openEuler-20.03-LTS-SP2' \ No newline at end of file + DIB_DISTRIBUTION_MIRROR: 'http://mirror.regionone.linaro-us.opendev.org/openeuler/openEuler-20.03-LTS-SP2' diff --git a/nodepool/nl01.opendev.org.yaml b/nodepool/nl01.opendev.org.yaml index 769e737f4d..1fc17adb1b 100644 --- a/nodepool/nl01.opendev.org.yaml +++ b/nodepool/nl01.opendev.org.yaml @@ -44,7 +44,7 @@ labels: min-ready: 1 - name: ubuntu-xenial min-ready: 1 - - name: openEuler-20.03-LTS-SP2 + - name: openEuler-20-03-LTS-SP2 min-ready: 1 providers: @@ -83,7 +83,7 @@ providers: config-drive: true - name: ubuntu-xenial config-drive: true - - name: openEuler-20.03-LTS-SP2 + - name: openEuler-20-03-LTS-SP2 config-drive: true pools: - name: main @@ -159,10 +159,10 @@ providers: flavor-name: 'Performance' diskimage: ubuntu-xenial key-name: infra-root-keys-2020-05-13 - - name: openEuler-20.03-LTS-SP2 + - name: openEuler-20-03-LTS-SP2 min-ram: 8192 flavor-name: 'Performance' - diskimage: openEuler-20.03-LTS-SP2 + diskimage: openEuler-20-03-LTS-SP2 key-name: infra-root-keys-2020-05-13 - name: rax-iad region-name: 'IAD' @@ -204,4 +204,4 @@ diskimages: - name: ubuntu-bionic - name: ubuntu-focal - name: ubuntu-xenial - - name: openEuler-20.03-LTS-SP2 + - name: openEuler-20-03-LTS-SP2 diff --git a/nodepool/nl03.opendev.org.yaml b/nodepool/nl03.opendev.org.yaml index 9aaa12ea76..2cbd737a40 100644 --- a/nodepool/nl03.opendev.org.yaml +++ b/nodepool/nl03.opendev.org.yaml @@ -74,7 +74,7 @@ labels: min-ready: 0 - name: nested-virt-centos-8-stream min-ready: 0 - - name: openEuler-20.03-LTS-SP2-arm64-xxxlarge + - name: openEuler-20-03-LTS-SP2-arm64-xxxlarge min-ready: 0 providers: @@ -410,7 +410,7 @@ providers: config-drive: true - name: ubuntu-focal-arm64 config-drive: true - - name: openEuler-20.03-LTS-SP2-arm64 + - name: openEuler-20-03-LTS-SP2-arm64 config-drive: true pools: - name: main @@ -466,10 +466,10 @@ providers: flavor-name: 'm1.xxxlarge' diskimage: ubuntu-focal-arm64 key-name: infra-root-keys-2020-05-13 - - name: openEuler-20.03-LTS-SP2-arm64-xxxlarge + - name: openEuler-20-03-LTS-SP2-arm64-xxxlarge min-ram: 16000 flavor-name: 'm1.xxxlarge' - diskimage: openEuler-20.03-LTS-SP2-arm64 + diskimage: openEuler-20-03-LTS-SP2-arm64 key-name: infra-root-keys-2020-05-13 - name: osuosl-regionone @@ -547,5 +547,5 @@ diskimages: - name: ubuntu-focal - name: ubuntu-focal-arm64 - name: ubuntu-xenial - - name: openEuler-20.03-LTS-SP2-arm64 + - name: openEuler-20-03-LTS-SP2-arm64