move cloud-run-user-script.conf to cloud-final, use cloud-cfg for invoking

This moves what was done as cloud-run-user-script.conf to 'cloud-final'
and makes that re-use the cloud-init-cfg code, but simply with a different
set of default configs.

Also, adds keys_to_console and final_message cloud-config modules

LP: #653271

2 files changed, 10 insertions, 28 deletions

diff --git a/upstart/cloud-final.conf b/upstart/cloud-final.conf
new file mode 100644
index 00000000..1127647a
--- /dev/null
+++ b/upstart/cloud-final.conf
@@ -0,0 +1,10 @@
+# cloud-final.conf - run "final" jobs
+# this runs around traditional "rc.local" time.
+# and after all cloud-config jobs are run
+description "execute cloud user/final scripts"
+
+start on (stopped rc RUNLEVEL=[2345] and stopped cloud-config)
+console output
+task
+
+exec cloud-init-cfg all cloud_final
diff --git a/upstart/cloud-run-user-script.conf b/upstart/cloud-run-user-script.conf
deleted file mode 100644
index e845aa71..00000000
--- a/upstart/cloud-run-user-script.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# cloud-run-user-script - runs user scripts found in user-data, that are
-#   stored in /var/lib/cloud/scripts by the initial cloudinit upstart job
-description "execute cloud user scripts"
-
-start on (stopped rc RUNLEVEL=[2345] and stopped cloud-config)
-console output
-task
-
-script
-bd=/var/lib/cloud
-toks="
-   ${bd}/scripts/per-once:once:cloud-scripts-per-once
-   ${bd}/scripts/per-boot:always:cloud-scripts-per-boot
-   ${bd}/scripts/per-instance:once-per-instance:cloud-scripts-per-instance
-   ${bd}/instance/scripts:once-per-instance:user-scripts
-"
-oifs=${IFS}
-errors=""
-for tok in ${toks}; do
-   IFS=":"; set -- ${tok}; IFS=${oifs}
-   dir=${1}; per=${2}; name=${3}
-   [ -d "${dir}" ] || continue
-   cloud-init-run-module "${per}" "${name}" execute \
-      run-parts --regex '.*' "$dir" || errors="${errors} ${name}"
-done
-errors=${errors# }
-[ -z "${errors}" ] || { echo "errors executing ${errors}" 1>&2; exit 1; }
-end script