Docs: Remove cron references
Cron support is gone. Remove the doc/config file references, and config supporting code. Change-Id: I6587c7c3122dc1eb16f2c58520e7d76de31624f3
This commit is contained in:
parent
dbc0ae77d2
commit
6da49fe732
@ -166,10 +166,6 @@ zookeeper-servers:
|
||||
- host: localhost
|
||||
port: 2181
|
||||
|
||||
cron:
|
||||
cleanup: '*/1 * * * *'
|
||||
check: '*/15 * * * *'
|
||||
|
||||
labels:
|
||||
- name: centos-7
|
||||
min-ready: 1
|
||||
|
@ -44,21 +44,6 @@ Example::
|
||||
|
||||
images-dir: /path/to/images/dir
|
||||
|
||||
cron
|
||||
----
|
||||
This section is optional.
|
||||
|
||||
Nodepool runs several periodic tasks. The ``cleanup`` task deletes
|
||||
old images and servers which may have encountered errors during their
|
||||
initial deletion. The ``check`` task attempts to log into each node
|
||||
that is waiting to be used to make sure that it is still operational.
|
||||
The following illustrates how to change the schedule for these tasks
|
||||
and also indicates their default values::
|
||||
|
||||
cron:
|
||||
cleanup: '27 */6 * * *'
|
||||
check: '*/15 * * * *'
|
||||
|
||||
zookeeper-servers
|
||||
-----------------
|
||||
Lists the ZooKeeper servers uses for coordinating information between
|
||||
|
@ -24,11 +24,6 @@ class ConfigValidator:
|
||||
self.config_file = config_file
|
||||
|
||||
def validate(self):
|
||||
cron = {
|
||||
'check': str,
|
||||
'cleanup': str,
|
||||
}
|
||||
|
||||
pool_label = {
|
||||
v.Required('name'): str,
|
||||
v.Required('diskimage'): str,
|
||||
@ -91,7 +86,6 @@ class ConfigValidator:
|
||||
'port': int,
|
||||
'chroot': str,
|
||||
}],
|
||||
'cron': cron,
|
||||
'providers': [provider],
|
||||
'labels': [label],
|
||||
'diskimages': [diskimage],
|
||||
|
@ -101,11 +101,6 @@ class ProviderLabel(ConfigValue):
|
||||
return "<ProviderLabel %s>" % self.name
|
||||
|
||||
|
||||
class Cron(ConfigValue):
|
||||
def __repr__(self):
|
||||
return "<Cron %s>" % self.name
|
||||
|
||||
|
||||
class DiskImage(ConfigValue):
|
||||
def __eq__(self, other):
|
||||
if (other.name != self.name or
|
||||
@ -156,17 +151,6 @@ def loadConfig(config_path):
|
||||
newconfig.provider_managers = {}
|
||||
newconfig.zookeeper_servers = {}
|
||||
newconfig.diskimages = {}
|
||||
newconfig.crons = {}
|
||||
|
||||
for name, default in [
|
||||
('cleanup', '* * * * *'),
|
||||
('check', '*/15 * * * *'),
|
||||
]:
|
||||
c = Cron()
|
||||
c.name = name
|
||||
newconfig.crons[c.name] = c
|
||||
c.job = None
|
||||
c.timespec = config.get('cron', {}).get(name, default)
|
||||
|
||||
for server in config.get('zookeeper-servers', []):
|
||||
z = zk.ZooKeeperConnectionConfig(server['host'],
|
||||
|
@ -1,10 +1,6 @@
|
||||
elements-dir: /etc/nodepool/elements
|
||||
images-dir: /opt/nodepool_dib
|
||||
|
||||
cron:
|
||||
cleanup: '*/1 * * * *'
|
||||
check: '*/15 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: zk1.openstack.org
|
||||
port: 2181
|
||||
|
@ -1,10 +1,6 @@
|
||||
elements-dir: /etc/nodepool/elements
|
||||
images-dir: /opt/nodepool_dib
|
||||
|
||||
cron:
|
||||
cleanup: '*/1 * * * *'
|
||||
check: '*/15 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: zk1.openstack.org
|
||||
port: 2181
|
||||
|
4
nodepool/tests/fixtures/integration.yaml
vendored
4
nodepool/tests/fixtures/integration.yaml
vendored
@ -1,9 +1,5 @@
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: localhost
|
||||
|
||||
|
4
nodepool/tests/fixtures/integration_occ.yaml
vendored
4
nodepool/tests/fixtures/integration_occ.yaml
vendored
@ -1,9 +1,5 @@
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: localhost
|
||||
|
||||
|
4
nodepool/tests/fixtures/leaked_node.yaml
vendored
4
nodepool/tests/fixtures/leaked_node.yaml
vendored
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '* * * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
4
nodepool/tests/fixtures/multiple_pools.yaml
vendored
4
nodepool/tests/fixtures/multiple_pools.yaml
vendored
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
4
nodepool/tests/fixtures/node.yaml
vendored
4
nodepool/tests/fixtures/node.yaml
vendored
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
4
nodepool/tests/fixtures/node_az.yaml
vendored
4
nodepool/tests/fixtures/node_az.yaml
vendored
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
4
nodepool/tests/fixtures/node_cmd.yaml
vendored
4
nodepool/tests/fixtures/node_cmd.yaml
vendored
@ -1,9 +1,5 @@
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
4
nodepool/tests/fixtures/node_ipv6.yaml
vendored
4
nodepool/tests/fixtures/node_ipv6.yaml
vendored
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
4
nodepool/tests/fixtures/node_net_name.yaml
vendored
4
nodepool/tests/fixtures/node_net_name.yaml
vendored
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
4
nodepool/tests/fixtures/node_quota.yaml
vendored
4
nodepool/tests/fixtures/node_quota.yaml
vendored
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
4
nodepool/tests/fixtures/node_two_image.yaml
vendored
4
nodepool/tests/fixtures/node_two_image.yaml
vendored
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
4
nodepool/tests/fixtures/node_vhd.yaml
vendored
4
nodepool/tests/fixtures/node_vhd.yaml
vendored
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: '{images_dir}'
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: {zookeeper_host}
|
||||
port: {zookeeper_port}
|
||||
|
@ -1,10 +1,6 @@
|
||||
elements-dir: .
|
||||
images-dir: /tmp/nodepool_dib
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
diskimages:
|
||||
- name: fake-dib-image
|
||||
elements:
|
||||
|
@ -1,9 +1,5 @@
|
||||
images-dir: tools/images
|
||||
|
||||
cron:
|
||||
check: '*/15 * * * *'
|
||||
cleanup: '*/1 * * * *'
|
||||
|
||||
zookeeper-servers:
|
||||
- host: localhost
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user