remove vendor-scripts-per-{boot,instance,once}

I don't see a real need for these.  The intent of the 'per-boot' or
'per-instance' or 'per-once' config modules is to handle running
scripts that were already inserted into the instance.

If the vendor is doing that, then there is value in vendor-data.

Ie, they'd already modified the image, they might as well have just
put the stuff in that they wanted.

4 files changed, 0 insertions, 132 deletions

diff --git a/cloudinit/config/cc_vendor_scripts_per_boot.py b/cloudinit/config/cc_vendor_scripts_per_boot.py
deleted file mode 100644
index 80446e99..00000000
--- a/cloudinit/config/cc_vendor_scripts_per_boot.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2011-2014 Canonical Ltd.
-#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
-#
-#    Author: Scott Moser <scott.moser@canonical.com>
-#    Author: Ben Howard <ben.howard@canonical.com>
-#    Author: Juerg Haefliger <juerg.haefliger@hp.com>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-
-from cloudinit import util
-
-from cloudinit.settings import PER_ALWAYS
-
-frequency = PER_ALWAYS
-
-SCRIPT_SUBDIR = 'per-boot'
-
-
-def handle(name, cfg, cloud, log, _args):
-    runparts_path = os.path.join(cloud.get_cpath(), 'scripts', 'vendor',
-                                 SCRIPT_SUBDIR)
-    vendor_prefix = util.get_nested_option_as_list(cfg, 'vendor_data',
-                                                   'prefix')
-    try:
-        util.runparts(runparts_path, exe_prefix=vendor_prefix)
-    except:
-        log.warn("Failed to run module %s (%s in %s)",
-                 name, SCRIPT_SUBDIR, runparts_path)
-        raise
diff --git a/cloudinit/config/cc_vendor_scripts_per_instance.py b/cloudinit/config/cc_vendor_scripts_per_instance.py
deleted file mode 100644
index 2d27a0c4..00000000
--- a/cloudinit/config/cc_vendor_scripts_per_instance.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2011-2014 Canonical Ltd.
-#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
-#
-#    Author: Scott Moser <scott.moser@canonical.com>
-#    Author: Ben Howard <ben.howard@canonical.com>
-#    Author: Juerg Haefliger <juerg.haefliger@hp.com>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-
-from cloudinit import util
-
-from cloudinit.settings import PER_INSTANCE
-
-frequency = PER_INSTANCE
-
-SCRIPT_SUBDIR = 'per-instance'
-
-
-def handle(name, cfg, cloud, log, _args):
-    runparts_path = os.path.join(cloud.get_cpath(), 'scripts', 'vendor',
-                                 SCRIPT_SUBDIR)
-    vendor_prefix = util.get_nested_option_as_list(cfg, 'vendor_data',
-                                                   'prefix')
-    try:
-        util.runparts(runparts_path, exe_prefix=vendor_prefix)
-    except:
-        log.warn("Failed to run module %s (%s in %s)",
-                 name, SCRIPT_SUBDIR, runparts_path)
-        raise
diff --git a/cloudinit/config/cc_vendor_scripts_per_once.py b/cloudinit/config/cc_vendor_scripts_per_once.py
deleted file mode 100644
index ad3e13c8..00000000
--- a/cloudinit/config/cc_vendor_scripts_per_once.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2011-2014 Canonical Ltd.
-#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
-#
-#    Author: Scott Moser <scott.moser@canonical.com>
-#    Author: Ben Howard <ben.howard@canonical.com>
-#    Author: Juerg Haefliger <juerg.haefliger@hp.com>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-
-from cloudinit import util
-
-from cloudinit.settings import PER_ONCE
-
-frequency = PER_ONCE
-
-SCRIPT_SUBDIR = 'per-once'
-
-
-def handle(name, cfg, cloud, log, _args):
-    runparts_path = os.path.join(cloud.get_cpath(), 'scripts', 'vendor',
-                                 SCRIPT_SUBDIR)
-    vendor_prefix = util.get_nested_option_as_list(cfg, 'vendor_data',
-                                                   'prefix')
-    try:
-        util.runparts(runparts_path, exe_prefix=vendor_prefix)
-    except:
-        log.warn("Failed to run module %s (%s in %s)",
-                 name, SCRIPT_SUBDIR, runparts_path)
-        raise
diff --git a/config/cloud.cfg b/config/cloud.cfg
index 8ed3522d..b746e3db 100644
--- a/config/cloud.cfg
+++ b/config/cloud.cfg
@@ -64,9 +64,6 @@ cloud_config_modules:
 # The modules that run in the 'final' stage
 cloud_final_modules:
  - rightscale_userdata
- - vendor-scripts-per-once
- - vendor-scripts-per-boot
- - vendor-scripts-per-instance
  - scripts-vendor
  - scripts-per-once
  - scripts-per-boot