Merge pull request #517 from plus3it/develop

Releases watchmaker 0.9.0

Author: lorengordon

.travis.yml

@@ -65,8 +65,9 @@ before_deploy:
       (set -x; python $TRAVIS_BUILD_DIR/ci/travis_set_build.py --skip "$TRAVIS_TAG")
     elif [ "$TRAVIS_BRANCH" = "master" ]
     then
-      VERSION=$(grep "version = " $TRAVIS_BUILD_DIR/setup.cfg | sed "s/version = //")
-      (set -x; git tag -a $VERSION -m $VERSION)
+      WAM_VERSION=$(grep "version = " $TRAVIS_BUILD_DIR/setup.cfg | sed "s/version = //")
+      export WAM_VERSION
+      (set -x; git tag -a $WAM_VERSION -m $WAM_VERSION)
     fi
 deploy:
   - provider: pypi
@@ -92,6 +93,7 @@ deploy:
       repo: plus3it/watchmaker
       condition: '"$TOXENV" == *"py27"*'
   - provider: releases
+    tag_name: $WAM_VERSION
     draft: true
     skip_cleanup: true
     api_key:

CHANGELOG.md

@@ -1,5 +1,45 @@
 ## Changelog
 
+### 0.9.0
+
+**Commit Delta**: [Change from 0.8.0 release](https://github.com/plus3it/watchmaker/compare/0.8.0...0.9.0)
+
+**Released**: 2018.02.12
+
+**Summary**:
+
+*   [[Issue #499][499]][[PR #513][513]] Includes additional details about the
+    platform and python version in the watchmaker log
+*   [[Issue #500][500]][[PR #512][512]] Retries file retrieval up to 5 times
+*   [[Issue #501][501]][[PR #507][507]] Uses urllib handlers to retrieve all
+    files
+    -   Deprecates the argument `--s3-source`; to retrieve a file from an S3
+        bucket use the syntax: `s3://<bucket>/<key>`
+    -   Local files may be specified as absolute or relative paths, and may or
+        may not be prefixed with `file://`
+*   [[PR #496][496]] Moves CloudFormation and Terraform templates to their own
+    project, [terraform-aws-watchmaker][terraform-aws-watchmaker]
+*   [[PR #491][491]] Improves compatibility of the watchmaker bootstrap.ps1
+    script when executed by an Azure custom script extension
+*   [[Issue #430][430]][[PR #487][487]] Writes watchmaker salt config to a
+    custom path:
+    -   Windows: `C:\Watchmaker\Salt\conf`
+    -   Linux: `/opt/watchmaker/salt`
+*   scap-formula
+    -   Incorporates content from OpenSCAP Security Guide v0.1.37-1
+
+[430]: https://github.com/plus3it/watchmaker/issues/430
+[499]: https://github.com/plus3it/watchmaker/issues/499
+[500]: https://github.com/plus3it/watchmaker/issues/500
+[501]: https://github.com/plus3it/watchmaker/issues/501
+[487]: https://github.com/plus3it/watchmaker/pull/487
+[491]: https://github.com/plus3it/watchmaker/pull/491
+[496]: https://github.com/plus3it/watchmaker/pull/496
+[507]: https://github.com/plus3it/watchmaker/pull/507
+[512]: https://github.com/plus3it/watchmaker/pull/512
+[513]: https://github.com/plus3it/watchmaker/pull/513
+[terraform-aws-watchmaker]: https://github.com/plus3it/terraform-aws-watchmaker
+
 ### 0.8.0
 
 **Commit Delta**: [Change from 0.7.2 release](https://github.com/plus3it/watchmaker/compare/0.7.2...0.8.0)

docs/configuration.md

@@ -73,10 +73,6 @@ Parameters supported by the Salt Worker:
 -   `exclude_states` (_string, comma-separated_): States to exclude from
     execution of salt states.
 
--   `s3_source` (_boolean_): Use S3 utilities to retrieve content instead of
-    http(s) utilities. For S3 utilities to work, the system must have boto
-    credentials configured that allow access to the S3 bucket.
-
 -   `user_formulas` (_dict_): Map of formula names and URLs to zip archives of
     salt formulas. These formulas will be downloaded, extracted, and added to
     the salt file roots. The zip archive must contain a top-level directory
@@ -152,7 +148,6 @@ all:
       ou_path: None
       salt_content: https://s3.amazonaws.com/watchmaker/salt-content.zip
       salt_states: Highstate
-      s3_source: False
       user_formulas:
         # To add extra formulas, specify them as a map of
         #    <formula_name>: <archive_url>

docs/faq.md

@@ -55,14 +55,48 @@ label may not be related to the error you are encountering.
 Watchmaker is supported on RedHat 7 and CentOS 7. See the [index](index.html)
 page for a list of all supported operating systems.
 
+## How can I exclude salt states when executing watchmaker?
+
+The Salt worker in Watchmaker supports an `exclude_states` argument. When
+present, the value is passed directly to the `exclude` option of the
+[salt highstate execution module](https://docs.saltstack.com/en/latest/ref/modules/all/salt.modules.state.html#salt.modules.state.highstate).
+To use this option with watchmaker from the command line, pass the argument
+`--exclude-states <sls_glob>`. For example:
+
+```
+# Exclude the state "foo" with an exact match
+watchmaker --exclude-states foo
+
+# Exclude all state names that begin with "foo"
+watchmaker --exclude-states foo*
+
+# Exclude multiple states "foo" and "bar" with an exact match
+watchmaker --exclude-states foo,bar
+```
+
+## Can I use the underlying salt functionality directly?
+
+Yes, by passing watchmaker's salt configuration directory to the salt command,
+using the `-c|--config-dir` argument:
+
+*   Linux: `/opt/watchmaker/salt`
+*   Windows: `C:\Watchmaker\salt\conf`
+
+For example:
+
+```
+# -c|--config-dir
+salt-call -c /opt/watchmaker/salt state.show_top
+```
+
 ## Can I use watchmaker to toggle my RedHat/Centos host's FIPS mode?
 
 Yes, indirectly. Because watchmaker implements most of its functionality via
 [SaltStack](https://saltstack.com) modules, you can directly-use the underlying
 SaltStack functionality to effect the desired change. This is done from the
 commandline - as root - by executing:
 
-*   Disable FIPS-mode: `salt-call --local ash.fips_disable`
-*   Enable FIPS-mode: `salt-call --local ash.fips_enable`
+*   Disable FIPS-mode: `salt-call -c /opt/watchmaker/salt ash.fips_disable`
+*   Enable FIPS-mode: `salt-call -c /opt/watchmaker/salt ash.fips_enable`
 
 And then rebooting the system.

docs/files/bootstrap/watchmaker-bootstrap.ps1

@@ -143,4 +143,9 @@ if( ${GitUrl} ) {
 Reset-EnvironmentVariables
 Write-Verbose "Reset the PATH environment for this shell"
 
+if ("$Env:TEMP".TrimEnd("\") -eq "${Env:windir}\System32\config\systemprofile\AppData\Local\Temp") {
+  $Env:TEMP, $Env:TMP = "${Env:windir}\Temp", "${Env:windir}\Temp"
+  Write-Verbose "Forced TEMP envs to ${Env:windir}\Temp"
+}
+
 Write-Verbose "${__ScriptName} complete!"