Skip to content

Commit ee35591

Browse files
committed
Update name of variable
1 parent ac8d884 commit ee35591

File tree

7 files changed

+22
-8
lines changed

7 files changed

+22
-8
lines changed

doc/source/configuration/security-hardening.rst

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,32 @@ whether or not workloads or API requests are affected by any configuration chang
4040
4141
kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/cis.yml
4242
43+
Targetting additional hosts
44+
---------------------------
45+
46+
The ``cis.yml`` playbook targets hosts in the ``cis-hardening`` group. By
47+
default this includes the ``overcloud`` group. You can adjust this group
48+
to suit your needs, e.g to add the seed VM:
49+
50+
.. code-block:: yaml
51+
:caption: $KAYOBE_CONFIG_PATH/inventory/groups
52+
53+
[cis-hardening:children]
54+
overcloud
55+
seed
56+
4357
Enabling the host configure hook
4458
--------------------------------
4559

4660
A hook is pre-installed but its execution is guarded by the
47-
``stackhpc_enable_cis_benchmark_hardening`` configuration option.
61+
``stackhpc_enable_cis_benchmark_hardening_hook`` configuration option.
4862
If you want the hardening playbooks to run automatically, as part of
4963
host configure, simply set this flag to ``true``:
5064

5165
.. code-block:: yaml
5266
:caption: $KAYOBE_CONFIG_PATH/stackhpc.yml
5367
54-
stackhpc_enable_cis_benchmark_hardening: true
68+
stackhpc_enable_cis_benchmark_hardening_hook: true
5569
5670
Alternatively, this can be toggled on a per-environment basis by
5771
setting it in an environment specific config file, or even on
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
---
22

3-
stackhpc_enable_cis_benchmark_hardening: true
3+
stackhpc_enable_cis_benchmark_hardening_hook: true
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
---
22

3-
stackhpc_enable_cis_benchmark_hardening: true
3+
stackhpc_enable_cis_benchmark_hardening_hook: true
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22

33
- import_playbook: ../../../ansible/cis.yml
4-
when: stackhpc_enable_cis_benchmark_hardening | bool
4+
when: stackhpc_enable_cis_benchmark_hardening_hook | bool

etc/kayobe/inventory/group_vars/all/stackhpc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# Feature flags
44

55
# Whether or not to run CIS benchmark hardening playbooks. Default is false.
6-
stackhpc_enable_cis_benchmark_hardening: false
6+
stackhpc_enable_cis_benchmark_hardening_hook: false

etc/kayobe/stackhpc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,4 +157,4 @@ stackhpc_docker_registry_password: "{{ pulp_password }}"
157157
# Feature flags
158158

159159
# Whether or not to run CIS benchmark hardening playbooks. Default is false.
160-
#stackhpc_enable_cis_benchmark_hardening:
160+
#stackhpc_enable_cis_benchmark_hardening_hook:

releasenotes/notes/adds-cis-hook-8cec8d42103d075e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ features:
33
- |
44
Adds a hook to automatically run the CIS benchmark hardening playbooks as
55
part of host configure. This is guarded by the
6-
``stackhpc_enable_cis_benchmark_hardening`` configuration option and is
6+
``stackhpc_enable_cis_benchmark_hardening_hook`` configuration option and is
77
disabled by default.

0 commit comments

Comments
 (0)