Merge "Remove script-dir"

devstack/plugin.sh

@@ -67,29 +67,7 @@ function nodepool_create_keypairs {
     fi
 }
 
-function nodepool_write_prepare {
+function nodepool_write_elements {
-    sudo mkdir -p $(dirname $NODEPOOL_CONFIG)/scripts
-    local pub_key=$(cat $NODEPOOL_PUBKEY)
-
-    cat > /tmp/prepare_node_ubuntu.sh <<EOF
-#!/bin/bash -x
-sudo adduser --disabled-password --gecos "" jenkins
-sudo mkdir -p /home/jenkins/.ssh
-cat > tmp_authorized_keys << INNEREOF
-  $pub_key
-INNEREOF
-sudo mv tmp_authorized_keys /home/jenkins/.ssh/authorized_keys
-sudo chmod 700 /home/jenkins/.ssh
-sudo chmod 600 /home/jenkins/.ssh/authorized_keys
-sudo chown -R jenkins:jenkins /home/jenkins
-sleep 5
-sync
-EOF
-    sudo mv /tmp/prepare_node_ubuntu.sh \
-         $(dirname $NODEPOOL_CONFIG)/scripts/prepare_node_ubuntu.sh
-
-    sudo chmod a+x $(dirname $NODEPOOL_CONFIG)/scripts/prepare_node_ubuntu.sh
-
     sudo mkdir -p $(dirname $NODEPOOL_CONFIG)/elements/nodepool-setup/install.d
     cat > /tmp/01-nodepool-setup <<EOF
 sudo mkdir -p /etc/nodepool
@@ -171,10 +149,9 @@ EOF
         DIB_GET_PIP="DIB_REPOLOCATION_pip_and_virtualenv: file://$NODEPOOL_CACHE_GET_PIP"
     fi
     cat > /tmp/nodepool.yaml <<EOF
-# You will need to make and populate these two paths as necessary,
+# You will need to make and populate this path as necessary,
 # cloning nodepool does not do this. Further in this doc we have an
-# example script for /path/to/nodepool/things/scripts.
+# example element.
-script-dir: $(dirname $NODEPOOL_CONFIG)/scripts
 elements-dir: $(dirname $NODEPOOL_CONFIG)/elements
 images-dir: $NODEPOOL_DIB_BASE_PATH/images
 # The mysql password here may be different depending on your
@@ -381,8 +358,8 @@ function configure_nodepool {
     # write the nodepool config
     nodepool_write_config
 
-    # write the prepare node script
+    # write the elements
-    nodepool_write_prepare
+    nodepool_write_elements
 
     # builds a fresh db
     recreate_database nodepool

doc/source/configuration.rst

@@ -72,19 +72,6 @@ full configuration file may have the ``diskimages``, ``labels``,
 The following sections are available.  All are required unless
 otherwise indicated.
 
-script-dir
-----------
-When creating an image to use when launching new nodes, Nodepool will
-run a script that is expected to prepare the machine before the
-snapshot image is created.  The ``script-dir`` parameter indicates a
-directory that holds all of the scripts needed to accomplish this.
-Nodepool will copy the entire directory to the machine before invoking
-the appropriate script for the image being created.
-
-Example::
-
-  script-dir: /path/to/script/dir
-
 .. _elements-dir:
 
 elements-dir

doc/source/scripts.rst

@@ -1,36 +1,7 @@
 .. _scripts:
 
-Node Prep Scripts
+Node Ready Scripts
-=================
+==================
-
-Nodepool requires the specification of a script directory
-(`script-dir`) in its configuration.  When Nodepool starts a virtual
-machine for the purpose of creating a snapshot image, all of the files
-within this directory will be copied to the virtual machine so they
-are available for use by the setup script.
-
-At various points in the image and node creation processes, these
-scripts may be invoked by nodepool.  See :ref:`configuration` for
-details.
-
-Any environment variables present in the nodepool daemon environment
-that begin with ``NODEPOOL_`` will be set in the calling environment
-for the script.  This is useful during testing to alter script
-behavior, for instance, to add a local ssh key that would not
-otherwise be set in production.
-
-Setup script
-------------
-
-Each provider can specify a setup script with `setup`, and that script is
-expected to exist in `script_dir`. If it is found, it will be run during image
-creation. When the script is invoked, the instance hostname will be passed in
-as the first parameter. This setup script will only be applied when building
-images using provider snapshots, not using diskimage-builder.
-
-
-Ready script
-------------
 
 Each label can specify a ready script with `ready-script`.  This script can be
 used to perform any last minute changes to a node after it has been launched

nodepool/builder.py

@@ -676,8 +676,6 @@ class BuildWorker(BaseWorker):
         # values in this thread.
         if self._config.elementsdir:
             env['ELEMENTS_PATH'] = self._config.elementsdir
-        if self._config.scriptdir:
-            env['NODEPOOL_SCRIPTDIR'] = self._config.scriptdir
 
         # send additional env vars if needed
         for k, v in diskimage.env_vars.items():

nodepool/cmd/config_validator.py

@@ -113,7 +113,6 @@ class ConfigValidator:
         }
 
         top_level = {
-            'script-dir': str,
             'elements-dir': str,
             'images-dir': str,
             'dburi': str,

nodepool/config.py

@@ -149,7 +149,6 @@ def loadConfig(config_path):
     newconfig.providers = {}
     newconfig.targets = {}
     newconfig.labels = {}
-    newconfig.scriptdir = config.get('script-dir')
     newconfig.elementsdir = config.get('elements-dir')
     newconfig.imagesdir = config.get('images-dir')
     newconfig.dburi = None

nodepool/tests/fixtures/config_validate/good.yaml

@@ -1,4 +1,3 @@
-script-dir: /etc/nodepool/scripts
 elements-dir: /etc/nodepool/elements
 images-dir: /opt/nodepool_dib
 

nodepool/tests/fixtures/config_validate/schema_error.yaml

@@ -1,4 +1,3 @@
-script-dir: /etc/nodepool/scripts
 elements-dir: /etc/nodepool/elements
 images-dir: /opt/nodepool_dib
 

nodepool/tests/fixtures/config_validate/yaml_error.yaml

@@ -1,4 +1,3 @@
-script-dir: /etc/nodepool/scripts
 elements-dir: /etc/nodepool/elements
 images-dir: /opt/nodepool_dib
 

nodepool/tests/fixtures/integration.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 images-dir: '{images_dir}'
 
 cron:

nodepool/tests/fixtures/integration_osc.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 images-dir: '{images_dir}'
 
 cron:

nodepool/tests/fixtures/leaked_node.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 elements-dir: .
 images-dir: '{images_dir}'
 

nodepool/tests/fixtures/node.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 elements-dir: .
 images-dir: '{images_dir}'
 

nodepool/tests/fixtures/node_az.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 elements-dir: .
 images-dir: '{images_dir}'
 

nodepool/tests/fixtures/node_cmd.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 images-dir: '{images_dir}'
 
 cron:

nodepool/tests/fixtures/node_disabled_label.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 elements-dir: .
 images-dir: '{images_dir}'
 

nodepool/tests/fixtures/node_diskimage_fail.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 elements-dir: .
 images-dir: '{images_dir}'
 

nodepool/tests/fixtures/node_diskimage_pause.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 elements-dir: .
 images-dir: '{images_dir}'
 

nodepool/tests/fixtures/node_image_upload_pause.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 elements-dir: .
 images-dir: '{images_dir}'
 

nodepool/tests/fixtures/node_ipv6.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 elements-dir: .
 images-dir: '{images_dir}'
 

nodepool/tests/fixtures/node_net_name.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 elements-dir: .
 images-dir: '{images_dir}'
 

nodepool/tests/fixtures/node_two_image.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 elements-dir: .
 images-dir: '{images_dir}'
 

nodepool/tests/fixtures/node_two_image_remove.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 elements-dir: .
 images-dir: '{images_dir}'
 

nodepool/tests/fixtures/node_two_provider.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 elements-dir: .
 images-dir: '{images_dir}'
 

nodepool/tests/fixtures/node_two_provider_remove.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 elements-dir: .
 images-dir: '{images_dir}'
 

nodepool/tests/fixtures/node_upload_fail.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 elements-dir: .
 images-dir: '{images_dir}'
 

nodepool/tests/fixtures/node_vhd.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 elements-dir: .
 images-dir: '{images_dir}'
 

nodepool/tests/fixtures/node_vhd_and_qcow2.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 elements-dir: .
 images-dir: '{images_dir}'
 

nodepool/tests/fixtures/subnodes.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 elements-dir: .
 images-dir: '{images_dir}'
 

tools/fake-dib.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 elements-dir: .
 images-dir: /tmp/nodepool_dib
 

tools/fake.yaml

@@ -1,4 +1,3 @@
-script-dir: .
 images-dir: tools/images
 
 cron: