Remove ready-script support

It no longer makes sense to have nodepool execute 'ready-scripts' on a
remote node. With zuulv3, we have ansible and are able to convert our
ready-scripts into ansible-playbooks.

Change-Id: I07b63a16a668bb9a37fb3f763ac29f307f6c3a65
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-03-14 12:34:56 -04:00
parent 44c55a52cf
commit 89de79e730
7 changed files with 0 additions and 25 deletions

View File

@ -98,7 +98,6 @@ label. Example::
- name: multi-precise - name: multi-precise
image: precise image: precise
min-ready: 2 min-ready: 2
ready-script: setup_multinode.sh
providers: providers:
- name: provider1 - name: provider1
@ -121,11 +120,6 @@ label. Example::
label considered disabled. ``min-ready`` is best-effort based on available label considered disabled. ``min-ready`` is best-effort based on available
capacity and is not a guaranteed allocation. capacity and is not a guaranteed allocation.
``ready-script``
A script to be used to perform any last minute changes to a node after it
has been launched but before it is put in the READY state to receive jobs.
For more information, see :ref:`scripts`.
.. _diskimages: .. _diskimages:
diskimages diskimages

View File

@ -86,7 +86,6 @@ class ConfigValidator:
'name': str, 'name': str,
'image': str, 'image': str,
'min-ready': int, 'min-ready': int,
'ready-script': str,
'providers': [{ 'providers': [{
'name': str, 'name': str,
}], }],

View File

@ -261,7 +261,6 @@ def loadConfig(config_path):
newconfig.labels[l.name] = l newconfig.labels[l.name] = l
l.image = label['image'] l.image = label['image']
l.min_ready = label.get('min-ready', 2) l.min_ready = label.get('min-ready', 2)
l.ready_script = label.get('ready-script')
l.providers = {} l.providers = {}
for provider in label['providers']: for provider in label['providers']:
p = LabelProvider() p = LabelProvider()

View File

@ -369,8 +369,6 @@ class NodeLauncher(threading.Thread, StatsReporter):
self._zk.storeNode(self._node) self._zk.storeNode(self._node)
self._writeNodepoolInfo(host, preferred_ip, self._node) self._writeNodepoolInfo(host, preferred_ip, self._node)
if self._label.ready_script:
self._runReadyScript(host, hostname, self._label.ready_script)
def _writeNodepoolInfo(self, host, preferred_ip, node): def _writeNodepoolInfo(self, host, preferred_ip, node):
key = paramiko.RSAKey.generate(2048) key = paramiko.RSAKey.generate(2048)
@ -409,16 +407,6 @@ class NodeLauncher(threading.Thread, StatsReporter):
ftp.close() ftp.close()
def _runReadyScript(self, host, hostname, script):
env_vars = ''
for k, v in os.environ.items():
if k.startswith('NODEPOOL_'):
env_vars += ' %s="%s"' % (k, v)
host.ssh("run ready script",
"cd /opt/nodepool-scripts && %s ./%s %s" %
(env_vars, script, hostname),
output=True)
def _run(self): def _run(self):
attempts = 1 attempts = 1
while attempts <= self._retries: while attempts <= self._retries:

View File

@ -13,14 +13,12 @@ zookeeper-servers:
labels: labels:
- name: trusty - name: trusty
image: trusty image: trusty
ready-script: configure_mirror.sh
min-ready: 1 min-ready: 1
providers: providers:
- name: cloud1 - name: cloud1
- name: cloud2 - name: cloud2
- name: trusty-2-node - name: trusty-2-node
image: trusty image: trusty
ready-script: multinode_setup.sh
min-ready: 0 min-ready: 0
providers: providers:
- name: cloud1 - name: cloud1

View File

@ -13,14 +13,12 @@ zookeeper-servers:
labels: labels:
- name: trusty - name: trusty
image: trusty image: trusty
ready-script: configure_mirror.sh
min-ready: 1 min-ready: 1
providers: providers:
- name: cloud1 - name: cloud1
- name: cloud2 - name: cloud2
- name: trusty-2-node - name: trusty-2-node
image: trusty image: trusty
ready-script: multinode_setup.sh
min-ready: 0 min-ready: 0
providers: providers:
- name: cloud1 - name: cloud1

View File

@ -27,7 +27,6 @@ labels:
- name: fake-provider - name: fake-provider
- name: multi-fake - name: multi-fake
image: fake-nodepool image: fake-nodepool
ready-script: multinode_setup.sh
min-ready: 2 min-ready: 2
providers: providers:
- name: fake-provider - name: fake-provider