Merge "Docs: Remove cron references" into feature/zuulv3

devstack/plugin.sh

@@ -166,10 +166,6 @@ zookeeper-servers:
   - host: localhost
     port: 2181
 
-cron:
-  cleanup: '*/1 * * * *'
-  check: '*/15 * * * *'
-
 labels:
   - name: centos-7
     min-ready: 1

doc/source/configuration.rst

@@ -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

nodepool/cmd/config_validator.py

@@ -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,
@@ -90,7 +85,6 @@ class ConfigValidator:
                 'port': int,
                 'chroot': str,
             }],
-            'cron': cron,
             'providers': [provider],
             'labels': [label],
             'diskimages': [diskimage],

nodepool/config.py

@@ -100,11 +100,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
@@ -155,17 +150,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'],

nodepool/tests/fixtures/config_validate/good.yaml

@@ -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

nodepool/tests/fixtures/config_validate/yaml_error.yaml

@@ -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

nodepool/tests/fixtures/integration.yaml

@@ -1,9 +1,5 @@
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: localhost
 

nodepool/tests/fixtures/integration_occ.yaml

@@ -1,9 +1,5 @@
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: localhost
 

nodepool/tests/fixtures/leaked_node.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '* * * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/multiple_pools.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/node.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/node_az.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/node_cmd.yaml

@@ -1,9 +1,5 @@
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/node_disabled_label.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/node_diskimage_fail.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/node_diskimage_only.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/node_diskimage_pause.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/node_image_upload_pause.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/node_ipv6.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/node_label_provider.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/node_launch_retry.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/node_lost_requests.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/node_net_name.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/node_quota.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/node_two_image.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/node_two_image_remove.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/node_two_provider.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/node_two_provider_remove.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/node_upload_fail.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/node_vhd.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

nodepool/tests/fixtures/node_vhd_and_qcow2.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: '{images_dir}'
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: {zookeeper_host}
     port: {zookeeper_port}

tools/fake-dib.yaml

@@ -1,10 +1,6 @@
 elements-dir: .
 images-dir: /tmp/nodepool_dib
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 diskimages:
   - name: fake-dib-image
     elements:

tools/fake.yaml

@@ -1,9 +1,5 @@
 images-dir: tools/images
 
-cron:
-  check: '*/15 * * * *'
-  cleanup: '*/1 * * * *'
-
 zookeeper-servers:
   - host: localhost