From 4723032ac00314f2b7f2c6d3468b04d3079cc404 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 12 Jan 2017 17:19:05 -0500 Subject: [PATCH] Remove script-dir from nodepool Switch back to master branch, until we are ready to run zuulv3 branch again in production. Change-Id: Id93a3c64282a31545a66dc1da740596d3db3909f Signed-off-by: Paul Belanger --- nodepool/nodepool.yaml | 1 - test-requirements.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index 60600b1ec1..dc10456787 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -1,4 +1,3 @@ -script-dir: /etc/nodepool/scripts elements-dir: /etc/nodepool/elements images-dir: /opt/nodepool_dib diff --git a/test-requirements.txt b/test-requirements.txt index df6c9f6941..d1f248880a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,3 +1,3 @@ hacking>=0.10,<0.11 bashate>=0.2 --e git://git.openstack.org/openstack-infra/nodepool@feature/zuulv3#egg=nodepool +-e git://git.openstack.org/openstack-infra/nodepool#egg=nodepool