Renames salt worker content_source to salt_content

docs/configuration.md

@@ -76,7 +76,7 @@ Parameters supported by the Salt Worker:
 
 -   `salt_debug_log` (_string_): Path to the debug logfile that salt will write
     to.
--   `content_source` (_string_): URL to the Salt content file that contains
+-   `salt_content` (_string_): URL to the Salt content file that contains
     further configuration specific to the salt install.
 -   `install_method` (_string_): (Linux-only) The method used to install Salt.
     Currently supports: `yum`, `git`
@@ -128,10 +128,10 @@ all:
   - salt:
       admin_groups: None
       admin_users: None
-      content_source: https://s3.amazonaws.com/watchmaker/salt-content.zip
       computer_name: None
       environment: False
       ou_path: None
+      salt_content: https://s3.amazonaws.com/watchmaker/salt-content.zip
       salt_states: Highstate
       s3_source: False
       user_formulas:

src/watchmaker/static/config.yaml

@@ -2,10 +2,10 @@ all:
   - salt:
       admin_groups: None
       admin_users: None
-      content_source: https://s3.amazonaws.com/watchmaker/salt-content.zip
       computer_name: None
       environment: False
       ou_path: None
+      salt_content: https://s3.amazonaws.com/watchmaker/salt-content.zip
       salt_states: Highstate
       s3_source: False
       user_formulas:

src/watchmaker/workers/salt.py

@@ -28,7 +28,7 @@ class SaltBase(ManagerBase):
             and user formulas from an S3 bucket. If ``True``, you must also
             install ``boto3`` and ``botocore``. Those dependencies will not be
             installed by Watchmaker.
-        content_source (:obj:`str`):
+        salt_content (:obj:`str`):
             (Defaults to ``''``) URL to a salt content archive (zip file) that
             will be uncompressed in the salt "srv" directory. This typically is
             used to create a top.sls file and to populate salt's file_roots.
@@ -80,7 +80,7 @@ def __init__(self, *args, **kwargs):  # noqa: D102
         self.ent_env = kwargs.pop('environment', None) or ''
         self.s3_source = kwargs.pop('s3_source', None) or False
         self.salt_debug_log = kwargs.pop('salt_debug_log', None) or ''
-        self.content_source = kwargs.pop('content_source', None) or ''
+        self.salt_content = kwargs.pop('salt_content', None) or ''
         self.ou_path = kwargs.pop('ou_path', None) or ''
         self.admin_groups = kwargs.pop('admin_groups', None) or ''
         self.admin_users = kwargs.pop('admin_users', None) or ''
@@ -194,14 +194,14 @@ def _get_formulas_conf(self):
         ]
 
     def _build_salt_formula(self, extract_dir):
-        if self.content_source:
-            salt_content_filename = self.content_source.split('/')[-1]
+        if self.salt_content:
+            salt_content_filename = self.salt_content.split('/')[-1]
             salt_content_file = os.sep.join((
                 self.working_dir,
                 salt_content_filename
             ))
             self.download_file(
-                self.content_source,
+                self.salt_content,
                 salt_content_file,
                 self.s3_source
             )