diff options
| author | Ryan Harper <ryan.harper@canonical.com> | 2021-04-14 14:35:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-14 14:35:32 -0500 |
| commit | cc16c9224681c9a60c2be5c52cff45aa17a8c010 (patch) | |
| tree | 35d273537b569584f107c7397fd48bdd8d08cd28 | |
| parent | 9f9e154ff54cc37e7d0831c431a9d1279832fc69 (diff) | |
| download | cloud-init-git-cc16c9224681c9a60c2be5c52cff45aa17a8c010.tar.gz | |
doc: Replace remaining references to user-scripts as a config module (#866)
git-grep showed a few more locations where we refer to a "user-scripts"
config module which is really cc_scripts_user module. Replace these
references with slightly different language so as not to confuse
future me when looking for "user-scripts" vs. "scripts-user"
| -rw-r--r-- | cloudinit/config/cc_rightscale_userdata.py | 2 | ||||
| -rw-r--r-- | doc/rtd/topics/boot.rst | 2 | ||||
| -rw-r--r-- | doc/rtd/topics/vendordata.rst | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cloudinit/config/cc_rightscale_userdata.py b/cloudinit/config/cc_rightscale_userdata.py index a5aca038..c75dc57d 100644 --- a/cloudinit/config/cc_rightscale_userdata.py +++ b/cloudinit/config/cc_rightscale_userdata.py @@ -44,7 +44,7 @@ user scripts configuration directory, to be run later by ``cc_scripts_user``. # - read the blob of data from raw user data, and parse it as key/value # - for each key that is found, download the content to # the local instance/scripts directory and set them executable. -# - the files in that directory will be run by the user-scripts module +# - the files in that directory will be run by the scripts-user module # Therefore, this must run before that. # # diff --git a/doc/rtd/topics/boot.rst b/doc/rtd/topics/boot.rst index a5282e35..f7dfcd3a 100644 --- a/doc/rtd/topics/boot.rst +++ b/doc/rtd/topics/boot.rst @@ -150,7 +150,7 @@ Things that run here include * package installations * configuration management plugins (puppet, chef, salt-minion) - * user-scripts (i.e. shell scripts passed as user-data) + * user-defined scripts (i.e. shell scripts passed as user-data) For scripts external to cloud-init looking to wait until cloud-init is finished, the ``cloud-init status`` subcommand can help block external diff --git a/doc/rtd/topics/vendordata.rst b/doc/rtd/topics/vendordata.rst index cdb552d0..87a899b3 100644 --- a/doc/rtd/topics/vendordata.rst +++ b/doc/rtd/topics/vendordata.rst @@ -47,8 +47,8 @@ way as user-data. The only differences are: - * user-scripts are stored in a different location than user-scripts (to - avoid namespace collision) + * vendor-data-defined scripts are stored in a different location than + user-data-defined scripts (to avoid namespace collision) * user can disable part handlers by cloud-config settings. For example, to disable handling of 'part-handlers' in vendor-data, the user could provide user-data like this: |