[FEATURE] Enable ipv6 within cluster.

This commit is related to #36
redhat-cop · Aug 29, 2022 · 881719e · 881719e
1 parent 911e62b
commit 881719e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/osia/cli.py b/osia/cli.py
@@ -63,6 +63,8 @@ def _read_list(in_str: str) -> List[str]:
                        'default': 'images'},
         'skip_clean': {'help': 'Skip clean when installation fails', 'action': 'store_true'},
         'enable_fips': {'help': 'Enable fips mode to the cluster', 'action': 'store_true'},
+        'enable_ipv6': {'help': 'Install custer with internally used ipv6 for cluster and service networks.',
+                        'action': 'store_true'},
     },
     'deprecated': {
         'psi_cloud': {'help': 'DEPRECATED see osp_cloud'},

diff --git a/osia/installer/clouds/base.py b/osia/installer/clouds/base.py
@@ -42,6 +42,7 @@ def __init__(self,
                  cluster_directory=None,
                  skip_clean=False,
                  enable_fips=False,
+                 enable_ipv6=False,
                  installer=None,
                  **unused_kwargs):
         self.cluster_name = cluster_name
@@ -60,6 +61,7 @@ def __init__(self,
         self.skip_clean = skip_clean
         self.installer = installer
         self.enable_fips = enable_fips
+        self.enable_ipv6 = enable_ipv6
 
     @abstractmethod
     def acquire_resources(self):

diff --git a/osia/installer/templates/install-config-base.yaml.jinja2 b/osia/installer/templates/install-config-base.yaml.jinja2
@@ -39,10 +39,14 @@ networking:
   clusterNetwork:
   - cidr: 10.128.0.0/14
     hostPrefix: 23
-  machineCIDR: {% block networkIp %}{% endblock %}
+{% if enable_ipv6 %}  - cidr: fd01::/48
+    hostPrefix: 64{% endif %}
+  machineNetwork:
+  - cidr: {% block networkIp %}{% endblock %}
   networkType: OpenShiftSDN
   serviceNetwork:
   - 172.30.0.0/16
+{% if enable_ipv6 %}  - fd02::/112{% endif %}
 platform:{% block platform %}{% endblock %}
 pullSecret: '{{ pull_secret }}'
 sshKey: |