Clean up / Workaround non-inclusive words

- CHANGELOG.md - README.md - examples/simple.yml - templates/ssh_config.j2 - tests/tests_global_config.yml In addition, fixed a yamllint failure and a typo. Signed-off-by: Noriko Hosoi <[email protected]>
nhosoi · Jan 16, 2023 · ed520d7 · ed520d7
1 parent ab5ce13
commit ed520d7
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -57,7 +57,7 @@ it is converted to string.
 
 ### Other Changes
 
-- changelog_to_tag action - support other than "master" for the main branch name, as well (#46)
+- changelog_to_tag action - github action ansible test improvements (#46)
 
 [1.1.8] - 2022-07-19
 --------------------
@@ -238,7 +238,7 @@ must be a `string` value like `"2.9"`, not a `float` value like `2.9`.
 ### Other Changes
 
 - Remove python-26 environment from tox testing
-- update to tox-lsr 2.4.0 - add support for ansible-test sanity with docker
+- update to tox-lsr 2.4.0 - add support for ansible-test with docker
 - CI: Add support for RHEL-9
 
 [1.0.0] - 2021-02-12

diff --git a/README.md b/README.md
@@ -87,7 +87,8 @@ none
 
 ## Example Playbook
 
-The folowing playbook configures the `root` user ssh configuration in his
+The following playbook configures the `root` user ssh configuration in his
+<!--- wokeignore:rule=master -->
 home directory to use compression, control-master multiplexing and enable
 GSSAPI authentication in the "match final all" block. Additionally, it
 creates alias "example" for connecting to the example.com host as a user
@@ -103,6 +104,7 @@ somebody. The last line disables X11 forwarding.
       ssh_user: root
       ssh:
         Compression: true
+        # wokeignore:rule=master
         ControlMaster: auto
         ControlPath: ~/.ssh/.cm%C
         Match:

diff --git a/examples/simple.yml b/examples/simple.yml
@@ -3,22 +3,23 @@
 - name: Example playbook for configuring ssh clients
   hosts: all
   tasks:
-  - name: Configure ssh clients
-    include_role:
-      name: linux-system-roles.ssh
-    vars:
-      ssh_user: root
-      ssh:
-        # noqa var-naming
-        Compression: true
-        GSSAPIAuthentication: false
-        ControlMaster: auto
-        ControlPath: ~/.ssh/.cm%C
-        Match:
-          - Condition: "final all"
-            GSSAPIAuthentication: true
-        Host:
-          - Condition: example
-            Hostname: example.com
-            User: somebody
-      ssh_ForwardX11: false
+    - name: Configure ssh clients
+      include_role:
+        name: linux-system-roles.ssh
+      vars:
+        ssh_user: root
+        ssh:
+          # noqa var-naming
+          Compression: true
+          GSSAPIAuthentication: false
+          # wokeignore:rule=master
+          ControlMaster: auto
+          ControlPath: ~/.ssh/.cm%C
+          Match:
+            - Condition: "final all"
+              GSSAPIAuthentication: true
+          Host:
+            - Condition: example
+              Hostname: example.com
+              User: somebody
+        ssh_ForwardX11: false
diff --git a/templates/ssh_config.j2 b/templates/ssh_config.j2
@@ -54,6 +54,7 @@ Match {{ match["Condition"] }}
 {{       render_option("CompressionLevel",match["CompressionLevel"],true) -}}
 {{       render_option("ConnectionAttempts",match["ConnectionAttempts"],true) -}}
 {{       render_option("ConnectTimeout",match["ConnectTimeout"],true) -}}
+{# wokeignore:rule=master #}
 {{       render_option("ControlMaster",match["ControlMaster"],true) -}}
 {{       render_option("ControlPath",match["ControlPath"],true) -}}
 {{       render_option("ControlPersist",match["ControlPersist"],true) -}}
@@ -176,6 +177,7 @@ Host {{ host["Condition"] }}
 {{       render_option("CompressionLevel",host["CompressionLevel"],true) -}}
 {{       render_option("ConnectionAttempts",host["ConnectionAttempts"],true) -}}
 {{       render_option("ConnectTimeout",host["ConnectTimeout"],true) -}}
+{# wokeignore:rule=master #}
 {{       render_option("ControlMaster",host["ControlMaster"],true) -}}
 {{       render_option("ControlPath",host["ControlPath"],true) -}}
 {{       render_option("ControlPersist",host["ControlPersist"],true) -}}
@@ -291,6 +293,7 @@ Host {{ host["Condition"] }}
 {{ body_option("CompressionLevel",ssh_CompressionLevel) -}}
 {{ body_option("ConnectionAttempts",ssh_ConnectionAttempts) -}}
 {{ body_option("ConnectTimeout",ssh_ConnectTimeout) -}}
+{# wokeignore:rule=master #}
 {{ body_option("ControlMaster",ssh_ControlMaster) -}}
 {{ body_option("ControlPath",ssh_ControlPath) -}}
 {{ body_option("ControlPersist",ssh_ControlPersist) -}}

diff --git a/tests/tests_global_config.yml b/tests/tests_global_config.yml
@@ -19,6 +19,7 @@
         ssh:
           Compression: true
           GSSAPIAuthentication: false
+          # wokeignore:rule=master
           ControlMaster: auto
           ControlPath: ~/.ssh/.cm%C
           Match:
@@ -58,6 +59,7 @@
             that:
               - "'Compression yes' in config.content | b64decode"
               - "'GSSAPIAuthentication no' in config.content | b64decode"
+              # wokeignore:rule=master
               - "'ControlMaster auto' in config.content | b64decode"
               - "'ControlPath ~/.ssh/.cm%C' in config.content | b64decode"
               - "'Match all' in config.content | b64decode"