Merge branch 'master' of github.com:project-faros/cluster-manager

project-faros · Jul 1, 2021 · 448448e · 448448e
2 parents 5148b4a + 8d580e6
commit 448448e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 1 deletion.
diff --git a/app/inventory.py b/app/inventory.py
@@ -210,6 +210,7 @@ def main(config, ipam, inv):
         extra_nodes=extra_nodes,
         ignored_macs=config['IGNORE_MACS'],
         dns_forwarders=[item['server'] for item in json.loads(config.get('DNS_FORWARDERS', '[]'))],
+        fips_mode=config.get('FIPS_MODE', 'False') == 'True',
         proxy=config['PROXY']=="True",
         proxy_http=config.get('PROXY_HTTP', ''),
         proxy_https=config.get('PROXY_HTTPS', ''),

diff --git a/app/playbooks/config.d/cluster/config.py b/app/playbooks/config.d/cluster/config.py
@@ -25,7 +25,8 @@ def __init__(self, path, footer, rtr_interfaces):
             ])
         self.cluster = ParameterCollection('cluster', 'Cluster Configuration', [
             PasswordParameter('ADMIN_PASSWORD', 'Adminstrator Password'),
-            PasswordParameter('PULL_SECRET', 'Pull Secret')
+            PasswordParameter('PULL_SECRET', 'Pull Secret'),
+            BooleanParameter('FIPS_MODE', 'FIPS Mode', 'False')
             ])
         self.architecture = ParameterCollection('architecture', 'Host Record Configuration', [
             StaticParameter('MGMT_PROVIDER', 'Machine Management Provider', 'ilo'),

diff --git a/app/playbooks/create.d/install-repos/create.yml b/app/playbooks/create.d/install-repos/create.yml
@@ -14,6 +14,7 @@
       openshift_installer_base_domain: '{{ cluster_domain }}'
       openshift_installer_control_plane: '{{ groups.control_plane }}'
       openshift_installer_ssh_key: '{{ lookup("file", ansible_ssh_private_key_file + ".pub") }}'
+      openshift_installer_fips_mode: "{{ fips_mode }}"
       openshift_installer_pull_secret: '{{ pull_secret | to_json }}'
       openshift_installer_version: "{{ lookup('ini', 'installer section=cluster file=/app/versions.ini') }}"
       openshift_installer_proxy: "{{ proxy }}"

diff --git a/app/roles/openshift-installer/defaults/main.yml b/app/roles/openshift-installer/defaults/main.yml
@@ -6,6 +6,7 @@ openshift_installer_control_plane: []
 openshift_installer_cluster_id: ocp
 openshift_installer_cluster_cidr: 10.128.0.0/14
 openshift_installer_service_cidr: 172.30.0.0/16
+openshift_installer_fips_mode: False
 openshift_installer_pull_secret: {}
 openshift_installer_ssh_key: ''
 openshift_installer_proxy: False

diff --git a/app/roles/openshift-installer/templates/install-config.yaml.j2 b/app/roles/openshift-installer/templates/install-config.yaml.j2
@@ -26,5 +26,6 @@ networking:
   - "{{ openshift_installer_service_cidr }}"
 platform:
     none: {}
+fips: "{{ openshift_installer_fips_mode }}"
 pullSecret: '{{ openshift_installer_pull_secret }}'
 sshKey: "{{ openshift_installer_ssh_key }}"
diff --git a/data.skel/config.sh b/data.skel/config.sh
@@ -5,6 +5,7 @@ export SUBNET_MASK=24
 export ALLOWED_SERVICES='["SSH to Bastion"]'
 # CLUSTER CONFIGURATION
 export ADMIN_PASSWORD='admin'
+export FIPS_MODE='False'
 export PULL_SECRET=''
 # CLUSTER HARDWARE
 export MGMT_PROVIDER='ilo'