Merge branch 'develop' into pip_state_mod_aggregate

doc/ref/modules/all/index.rst

@@ -211,6 +211,7 @@ execution modules
     keyboard
     keystone
     keystoneng
+    keystore
     kmod
     kubernetes
     launchctl_service
@@ -510,6 +511,7 @@ execution modules
     xapi_virt
     xbpspkg
     xfs
+    xml
     xmpp
     yumpkg
     zabbix

doc/ref/modules/all/salt.modules.keystore.rst

@@ -0,0 +1,6 @@
+=====================
+salt.modules.keystore
+=====================
+
+.. automodule:: salt.modules.keystore
+    :members:

doc/ref/modules/all/salt.modules.xml.rst

@@ -0,0 +1,6 @@
+================
+salt.modules.xml
+================
+
+.. automodule:: salt.modules.xml
+    :members:

doc/ref/states/all/index.rst

@@ -151,6 +151,7 @@ state modules
     keystone_role_grant
     keystone_service
     keystone_user
+    keystore
     kmod
     kubernetes
     layman
@@ -315,6 +316,7 @@ state modules
     win_wua
     winrepo
     x509
+    xml
     xmpp
     zabbix_action
     zabbix_host

doc/ref/states/all/salt.states.keystore.rst

@@ -0,0 +1,6 @@
+====================
+salt.states.keystore
+====================
+
+.. automodule:: salt.states.keystore
+    :members:

doc/ref/states/all/salt.states.xml.rst

@@ -0,0 +1,6 @@
+===============
+salt.states.xml
+===============
+
+.. automodule:: salt.states.xml
+    :members:

doc/topics/releases/neon.rst

@@ -16,15 +16,16 @@ to see the data loaded from a jinja map, or imported using ``import_yaml`` or
 Saltcheck Updates
 =================
 
-Available since 2018.3, the saltcheck module has been enhanced to:
- * Support saltenv environments
- * Associate tests with states by naming convention
- * Adds empty and notempty assertions
- * Adds skip keyword
- * Adds print_result keyword
- * Adds assertion_section keyword
- * Use saltcheck.state_apply to run state.apply for test setup or teardown
- * Changes output to display test time
+Available since 2018.3, the :py:func:`saltcheck module <salt.modules.saltcheck>`
+has been enhanced to:
+* Support saltenv environments
+* Associate tests with states by naming convention
+* Adds empty and notempty assertions
+* Adds skip keyword
+* Adds print_result keyword
+* Adds assertion_section keyword
+* Use saltcheck.state_apply to run state.apply for test setup or teardown
+* Changes output to display test time
 
 Saltcheck provides unittest like functionality requiring only the knowledge of
 salt module execution and yaml. Saltcheck uses salt modules to return data, then
@@ -173,11 +174,62 @@ New output:
           Skipped:
               0
 
-XML Module
-==========
 
-A new state and execution module for editing XML files is now included. Currently it allows for
-editing values from an xpath query, or editing XML IDs.
+Keystore State and Module
+=========================
+
+A new :py:func:`state <salt.states.keystore>` and
+:py:func:`execution module <salt.modules.keystore>` for manaing Java
+Keystore files is now included. It allows for adding/removing/listing
+as well as managing keystore files.
+
+.. code-block:: bash
+
+  # salt-call keystore.list /path/to/keystore.jks changeit
+  local:
+    |_
+      ----------
+      alias:
+          hostname1
+      expired:
+          True
+      sha1:
+          CB:5E:DE:50:57:99:51:87:8E:2E:67:13:C5:3B:E9:38:EB:23:7E:40
+      type:
+          TrustedCertEntry
+      valid_start:
+          August 22 2012
+      valid_until:
+          August 21 2017
+
+.. code-block:: yaml
+
+  define_keystore:
+    keystore.managed:
+      - name: /tmp/statestore.jks
+      - passphrase: changeit
+      - force_remove: True
+      - entries:
+        - alias: hostname1
+          certificate: /tmp/testcert.crt
+        - alias: remotehost
+          certificate: /tmp/512.cert
+          private_key: /tmp/512.key
+        - alias: stringhost
+          certificate: |
+            -----BEGIN CERTIFICATE-----
+            MIICEjCCAX
+            Hn+GmxZA
+            -----END CERTIFICATE-----
+
+
+XML State and Module
+====================
+
+A new :py:func:`state <salt.states.xml>` and
+:py:func:`execution module <salt.modules.xml>` for editing XML files is
+now included. Currently it allows for editing values from an xpath query, or
+editing XML IDs.
 
 .. code-block:: bash
 
@@ -210,7 +262,6 @@ editing values from an xpath query, or editing XML IDs.
         - value: William Shatner
 
 
-
 State Changes
 =============
 

salt/engines/logentries.py

@@ -29,9 +29,9 @@
 
         engines:
           - logentries:
-            endpoint: data.logentries.com
-            port: 10000
-            token: 057af3e2-1c05-47c5-882a-5cd644655dbf
+              endpoint: data.logentries.com
+              port: 10000
+              token: 057af3e2-1c05-47c5-882a-5cd644655dbf
 
 The 'token' can be obtained from the Logentries service.
 

salt/engines/logstash_engine.py

@@ -13,9 +13,9 @@
 
         engines:
           - logstash:
-            host: log.my_network.com
-            port: 5959
-            proto: tcp
+              host: log.my_network.com
+              port: 5959
+              proto: tcp
 
 :depends: logstash
 '''

salt/modules/boto_ssm.py

@@ -2,41 +2,15 @@
 '''
 Connection module for Amazon SSM
 
-:configuration: This module accepts explicit ssm credentials but can also
-    utilize IAM roles assigned to the instance through Instance Profiles. Dynamic
-    credentials are then automatically obtained from AWS API and no further
-    configuration is necessary. More Information available at:
+:configuration: This module uses IAM roles assigned to the instance through
+    Instance Profiles. Dynamic credentials are then automatically obtained
+    from AWS API and no further configuration is necessary. More Information
+    available at:
 
     .. code-block:: text
 
         http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html
 
-    If IAM roles are not used you need to specify them either in a pillar or
-    in the minion's config file:
-
-    .. code-block:: yaml
-
-        ssm.keyid: GKTADJGHEIQSXMKKRBJ08H
-        ssm.key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs
-
-    A region may also be specified in the configuration:
-
-    .. code-block:: yaml
-
-        ssm.region: us-east-1
-
-    If a region is not specified, the default is us-east-1.
-
-    It's also possible to specify key, keyid and region via a profile, either
-    as a passed in dict, or as a string to pull from pillars or minion config:
-
-    .. code-block:: yaml
-
-        myprofile:
-            keyid: GKTADJGHEIQSXMKKRBJ08H
-            key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs
-            region: us-east-1
-
 :depends: boto3
 '''
 # Import Python libs