the openshiftpods driver had some duplicated code from the openshift driver that wasn't working as expected; the main issues being: 1. the 'max-pods' config field wasn't taken into account 2. the 'max-servers' config field didn't pass the config validator despite being correct This refactor fixes both issues and removes redundant code, which should improve maintainability in the future. Add validation to ensure aliases are mutually exclusive in these providers' configurations. Add testing to validate this behavior. Change-Id: Iea8c898c4c2ce61d138d280bd2fadd9cbe8e8b61
68 lines
1.3 KiB
YAML
68 lines
1.3 KiB
YAML
elements-dir: /etc/nodepool/elements
|
|
images-dir: /opt/nodepool_dib
|
|
|
|
webapp:
|
|
port: %(NODEPOOL_PORT)
|
|
listen_address: '0.0.0.0'
|
|
|
|
zookeeper-servers:
|
|
- host: zk1.openstack.org
|
|
port: 2181
|
|
chroot: /test
|
|
|
|
labels:
|
|
- name: trusty
|
|
max-ready-age: 3600
|
|
min-ready: 1
|
|
- name: trusty-2-node
|
|
min-ready: 0
|
|
- name: trusty-external
|
|
min-ready: 1
|
|
- name: trusty-static
|
|
- name: kubernetes-namespace
|
|
- name: pod-fedora
|
|
- name: pod-custom
|
|
- name: openshift-project
|
|
- name: openshift-pod
|
|
- name: centos-ami
|
|
- name: winrm
|
|
- name: winssh
|
|
|
|
|
|
providers:
|
|
|
|
- name: openshift-single-project
|
|
driver: openshiftpods
|
|
context: "/hostname:8443/developer"
|
|
max-pods: 30
|
|
max-servers: 15
|
|
pools:
|
|
- name: project-name
|
|
labels:
|
|
- name: openshift-pod
|
|
image: docker.io/fedora:28
|
|
env:
|
|
- name: FOO
|
|
value: bar
|
|
|
|
diskimages:
|
|
- name: trusty
|
|
formats:
|
|
- tar
|
|
pause: False
|
|
elements:
|
|
- ubuntu
|
|
- vm
|
|
- openstack-repos
|
|
- puppet
|
|
- nodepool-base
|
|
- cache-devstack
|
|
release: trusty
|
|
rebuild-age: 3600
|
|
build-timeout: 3600
|
|
python-path: /bin/python3.6
|
|
env-vars:
|
|
TMPDIR: /opt/dib_tmp
|
|
DIB_IMAGE_CACHE: /opt/dib_cache
|
|
QEMU_IMG_OPTIONS: compat=0.10
|