916d62a374
For drivers that support tagging/metadata (openstack, aws, azure), Add or enhance support for supplying tags for uploaded diskimages. This allows users to set metadata on the global diskimage object which will then be used as default values for metadata on the provider diskimage values. The resulting merged dictionary forms the basis of metadata to be associated with the uploaded image. The changes needed to reconcile this for the three drivers mentioned above are: All: the diskimages[].meta key is added to supply the default values for provider metadata. OpenStack: provider diskimage metadata is already supported using providers[].diskimages[].meta, so no further changes are needed. AWS, Azure: provider diskimage tags are added using the key providers[].diskimages[].tags since these providers already use the "tags" nomenclature for instances. This results in the somewhat incongruous situation where we have diskimage "metadata" being combined with provider "tags", but it's either that or have images with "metadata" while we have instances with "tags", both of which are "tags" in EC2. The chosen approach has consistency within the driver. Change-Id: I30aadadf022af3aa97772011cda8dbae0113a3d8
67 lines
2.0 KiB
YAML
67 lines
2.0 KiB
YAML
elements-dir: .
|
|
images-dir: '{images_dir}'
|
|
build-log-dir: '{build_log_dir}'
|
|
build-log-retention: 1
|
|
|
|
webapp:
|
|
port: 8005
|
|
listen_address: '0.0.0.0'
|
|
|
|
zookeeper-servers:
|
|
- host: {zookeeper_host}
|
|
port: {zookeeper_port}
|
|
chroot: {zookeeper_chroot}
|
|
|
|
zookeeper-tls:
|
|
ca: {zookeeper_ca}
|
|
cert: {zookeeper_cert}
|
|
key: {zookeeper_key}
|
|
|
|
labels:
|
|
- name: bionic
|
|
min-ready: 0
|
|
|
|
providers:
|
|
- name: azure
|
|
driver: azure
|
|
zuul-public-key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+mplenM+m6pNY9Un3fpO9eqf808Jrfb3d1gXg7BZVawCvtEZ/cDYvLQ3OF1AeL2kcIC0UAIglM5JXae7yO5CJbJRdkbXvv0u1LvpLxYSPM4ATR0r4IseC5YVxkfJQNi4ixSwTqD4ScEkuCXcSqSU9M+hB+KlnwXoR4IcYHf7vD2Z0Mdwm2ikk3SeERmspmMxx/uz0SPn58QxONuoTlNWQKqDWsV6bRyoPa6HWccMrIH1/e7E69Nw/30oioOQpKBgaDCauh+QkDtSkjRpRMOV47ZFh16Q9DqMgLx+FD8z6++9rsHlB65Zas1xyQsiRCFG09s00b7OR7Xz9ukQ5+vXV
|
|
resource-group-location: centralus
|
|
location: centralus
|
|
resource-group: nodepool
|
|
auth-path: {auth_path}
|
|
subnet-id: /subscriptions/c35cf7df-ed75-4c85-be00-535409a85120/resourceGroups/nodepool/providers/Microsoft.Network/virtualNetworks/NodePool/subnets/default
|
|
diskimages:
|
|
- name: fake-image
|
|
tags:
|
|
provider_metadata: provider
|
|
pools:
|
|
- name: main
|
|
max-servers: 10
|
|
node-attributes:
|
|
key1: value1
|
|
key2: value2
|
|
labels:
|
|
- name: bionic
|
|
diskimage: fake-image
|
|
hardware-profile:
|
|
vm-size: Standard_B1ls
|
|
tags:
|
|
department: R&D
|
|
team: DevOps
|
|
systemPurpose: CI
|
|
|
|
diskimages:
|
|
- name: fake-image
|
|
elements:
|
|
- fedora
|
|
- vm
|
|
release: 21
|
|
dib-cmd: nodepool/tests/fake-image-create
|
|
env-vars:
|
|
TMPDIR: /opt/dib_tmp
|
|
DIB_IMAGE_CACHE: /opt/dib_cache
|
|
DIB_CLOUD_IMAGES: http://download.fedoraproject.org/pub/fedora/linux/releases/test/21-Beta/Cloud/Images/x86_64/
|
|
BASE_IMAGE_FILE: Fedora-Cloud-Base-20141029-21_Beta.x86_64.qcow2
|
|
metadata:
|
|
diskimage_metadata: diskimage
|