From 8932b81c5a794896af126e735d53b02c7c05deb4 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 16 Mar 2021 14:54:43 -0700 Subject: [PATCH] Update nodepool zk configs to be a bit less confusing Our system-config roles for nodepool update the zookeeper configuration for our nodepool hosts. The content in the files here is merely a placeholder. Make that more apparent via the addition of comments and use of dummy data. Change-Id: I4e35088a04f6393409963f841f2e9ba174c69598 --- nodepool/nb03.opendev.org.yaml | 14 ++++++++------ nodepool/nl01.opendev.org.yaml | 14 ++++++++------ nodepool/nl02.opendev.org.yaml | 14 ++++++++------ nodepool/nl03.opendev.org.yaml | 14 ++++++++------ nodepool/nl04.opendev.org.yaml | 14 ++++++++------ nodepool/nodepool.yaml | 14 ++++++++------ 6 files changed, 48 insertions(+), 36 deletions(-) diff --git a/nodepool/nb03.opendev.org.yaml b/nodepool/nb03.opendev.org.yaml index f52a4271d0..1e105a683b 100644 --- a/nodepool/nb03.opendev.org.yaml +++ b/nodepool/nb03.opendev.org.yaml @@ -1,13 +1,15 @@ elements-dir: /etc/nodepool/elements images-dir: /opt/nodepool_dib +# This portion of the config is updated by ansible to use the actual +# zookeeper servers. zookeeper-servers: - - host: zk01.openstack.org - port: 2181 - - host: zk02.openstack.org - port: 2181 - - host: zk03.openstack.org - port: 2181 + - host: zk01.example.org + port: 2281 + - host: zk02.example.org + port: 2281 + - host: zk03.example.org + port: 2281 providers: - name: linaro-us diff --git a/nodepool/nl01.opendev.org.yaml b/nodepool/nl01.opendev.org.yaml index a27c701f82..20c3234c53 100644 --- a/nodepool/nl01.opendev.org.yaml +++ b/nodepool/nl01.opendev.org.yaml @@ -1,13 +1,15 @@ elements-dir: /etc/nodepool/elements images-dir: /opt/nodepool_dib +# This portion of the config is updated by ansible to use the actual +# zookeeper servers. zookeeper-servers: - - host: zk01.openstack.org - port: 2181 - - host: zk02.openstack.org - port: 2181 - - host: zk03.openstack.org - port: 2181 + - host: zk01.example.org + port: 2281 + - host: zk02.example.org + port: 2281 + - host: zk03.example.org + port: 2281 # NOTE(pabelanger): To avoid a race conditions between multiple launchers, only # nl01.o.o will manage min-ready of our labels. If nl01.o.o is ever disabled, diff --git a/nodepool/nl02.opendev.org.yaml b/nodepool/nl02.opendev.org.yaml index 9f8129bdb3..06202f39f5 100644 --- a/nodepool/nl02.opendev.org.yaml +++ b/nodepool/nl02.opendev.org.yaml @@ -1,13 +1,15 @@ elements-dir: /etc/nodepool/elements images-dir: /opt/nodepool_dib +# This portion of the config is updated by ansible to use the actual +# zookeeper servers. zookeeper-servers: - - host: zk01.openstack.org - port: 2181 - - host: zk02.openstack.org - port: 2181 - - host: zk03.openstack.org - port: 2181 + - host: zk01.example.org + port: 2281 + - host: zk02.example.org + port: 2281 + - host: zk03.example.org + port: 2281 # NOTE(pabelanger): To avoid a race conditions between multiple launchers, only # nl01.o.o will manage min-ready of our labels. If nl01.o.o is ever disabled, diff --git a/nodepool/nl03.opendev.org.yaml b/nodepool/nl03.opendev.org.yaml index dfb0127189..c963fb7bcb 100644 --- a/nodepool/nl03.opendev.org.yaml +++ b/nodepool/nl03.opendev.org.yaml @@ -1,13 +1,15 @@ elements-dir: /etc/nodepool/elements images-dir: /opt/nodepool_dib +# This portion of the config is updated by ansible to use the actual +# zookeeper servers. zookeeper-servers: - - host: zk01.openstack.org - port: 2181 - - host: zk02.openstack.org - port: 2181 - - host: zk03.openstack.org - port: 2181 + - host: zk01.example.org + port: 2281 + - host: zk02.example.org + port: 2281 + - host: zk03.example.org + port: 2281 # NOTE(pabelanger): To avoid a race conditions between multiple launchers, only # nl01.o.o will manage min-ready of our labels. If nl01.o.o is ever disabled, diff --git a/nodepool/nl04.opendev.org.yaml b/nodepool/nl04.opendev.org.yaml index dc2055b06c..2fe5b6e1d9 100644 --- a/nodepool/nl04.opendev.org.yaml +++ b/nodepool/nl04.opendev.org.yaml @@ -1,13 +1,15 @@ elements-dir: /etc/nodepool/elements images-dir: /opt/nodepool_dib +# This portion of the config is updated by ansible to use the actual +# zookeeper servers. zookeeper-servers: - - host: zk01.openstack.org - port: 2181 - - host: zk02.openstack.org - port: 2181 - - host: zk03.openstack.org - port: 2181 + - host: zk01.example.org + port: 2281 + - host: zk02.example.org + port: 2281 + - host: zk03.example.org + port: 2281 # NOTE(pabelanger): To avoid a race conditions between multiple launchers, only # nl01.o.o will manage min-ready of our labels. If nl01.o.o is ever disabled, diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index d63bfca2fe..cca08c752c 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -1,13 +1,15 @@ elements-dir: /etc/nodepool/elements images-dir: /opt/nodepool_dib +# This portion of the config is updated by ansible to use the actual +# zookeeper servers. zookeeper-servers: - - host: zk01.openstack.org - port: 2181 - - host: zk02.openstack.org - port: 2181 - - host: zk03.openstack.org - port: 2181 + - host: zk01.example.org + port: 2281 + - host: zk02.example.org + port: 2281 + - host: zk03.example.org + port: 2281 providers: - name: ovh-bhs1