Skip to content

Commit 480a7a5

Browse files
committed
[3/4] Upgrade GitLab to Amazon Linux 2023 (#6160)
Enable FIPS and associated reboot dependencies
1 parent 0ade755 commit 480a7a5

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

terraform/gitlab/gitlab.tf.json.template.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1615,7 +1615,8 @@ def merge(sets: Iterable[Iterable[str]]) -> Iterable[str]:
16151615
'docker',
16161616
'amazon-cloudwatch-agent',
16171617
'amazon-ecr-credential-helper',
1618-
'dracut-fips',
1618+
'crypto-policies',
1619+
'crypto-policies-scripts',
16191620
(
16201621
'https://s3.amazonaws.com'
16211622
'/ec2-downloads-windows/SSMAgent/latest/linux_amd64'
@@ -2162,8 +2163,7 @@ def merge(sets: Iterable[Iterable[str]]) -> Iterable[str]:
21622163
],
21632164
'runcmd': [
21642165
['systemctl', 'daemon-reload'],
2165-
['dracut', '-f'],
2166-
['/sbin/grubby', '--update-kernel=ALL', '--args="fips=1"'],
2166+
['fips-mode-setup', '--enable'],
21672167
[
21682168
'sed',
21692169
'--in-place',
@@ -2193,9 +2193,11 @@ def merge(sets: Iterable[Iterable[str]]) -> Iterable[str]:
21932193
'-c', 'file:/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json',
21942194
'-s' # restart agent afterwards
21952195
],
2196-
['yum', '-y', 'update'],
21972196
['systemctl', 'enable', '--now', 'amazon-ssm-agent.service']
21982197
],
2198+
'package_update': True,
2199+
'package_upgrade': True,
2200+
'package_reboot_if_required': True,
21992201
# Reboot to realize the added kernel parameter the changed sshd configuration
22002202
'power_state': {
22012203
'mode': 'reboot'

0 commit comments

Comments
 (0)