From bf29a5b40636eab9dded23336145cf44559c450b Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 28 Feb 2017 10:13:20 -0500 Subject: [PATCH] Add nodepool-id to infracloud-chocolate Because we want to share infracloud-chocolate between nodepool.o.o and nl01.o.o, we need to use the new 'nodepool-id' for the provider. Otherwise, nodepool.o.o will proceed to delete the instances that nl01.o.o launches. Change-Id: Ic5d1f0ebf7eb92c841ec09502e5134d89c8f6e97 Signed-off-by: Paul Belanger --- nodepool/nodepool.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index 7d4cb6dc92..f2cd9d08f5 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -863,7 +863,8 @@ providers: cloud: infracloud-chocolate api-timeout: 60 boot-timeout: 120 - max-servers: 100 + max-servers: 90 + nodepool-id: 'nodepool.openstack.org' rate: 0.25 image-type: 'qcow2' template-hostname: '{image.name}-{timestamp}'