Merge pull request openshift-metal3#841 from hardys/ignition_extra

Add IGNITION_EXTRA for testing ignition customization

Author: stbenjam

README.md

@@ -67,6 +67,10 @@ DNS_VIP="1.1.1.1"
 NETWORK_TYPE="OpenShiftSDN"
 # Set to the subnet in use on the external (baremetal) network
 EXTERNAL_SUBNET="192.168.111.0/24"
+# Provide additional master/worker ignition configuration, will be
+# merged with the installer provided config, can be used to modify
+# the default nic configuration etc
+export IGNITION_EXTRA=extra.ign
 ```
 
 ## Installation
@@ -266,3 +270,17 @@ Custom MAO image name is a mandatory parameter but the others are optional with
 
 Alternatively, all input parameters can be set via `CUSTOM_MAO_IMAGE`, `REPO_NAME` and `MAO_BRANCH` variables respectively,
 and `run-custom-mao.sh` can be run automatically if you set `TEST_CUSTOM_MAO` to true.
+
+### Testing a customizations to the deployed OS
+
+It is possible to pass additional ignition configuration which will be merged with the installer generated files
+prior to deployment.  This can be useful for debug/testing during development, and potentially also for configuration
+of networking or storage on baremetal nodes needed before cluster configuration starts (most machine configuration
+should use the machine-config-operator, but for changes required before that starts, ignition may be an option).
+
+The following adds an additional file `/etc/test` as an example:
+
+```
+export IGNITION_EXTRA="ignition/file_example.ign"
+``` 
+

ignition/file_example.ign

@@ -0,0 +1 @@
+{"ignition": {"version": "2.3.0"}, "storage": {"files": [{"path": "/etc/test", "filesystem": "root", "mode": 436, "contents": {"source": "data:,test-foo%0A"}}]}}

utils.sh

@@ -51,6 +51,17 @@ function create_cluster() {
     cp -rf assets/generated/*.yaml ${assets_dir}/openshift
 
     cp ${assets_dir}/install-config.yaml{.tmp,}
+    if [ ! -z "${IGNITION_EXTRA:-}" ]; then
+      $OPENSHIFT_INSTALLER --dir "${assets_dir}" --log-level=debug create ignition-configs
+      if ! jq . ${IGNITION_EXTRA}; then
+        echo "Error ${IGNITION_EXTRA} not valid json"
+	exit 1
+      fi
+      mv ${assets_dir}/master.ign ${assets_dir}/master.ign.orig
+      jq -s '.[0] * .[1]' ${IGNITION_EXTRA} ${assets_dir}/master.ign.orig | tee ${assets_dir}/master.ign
+      mv ${assets_dir}/worker.ign ${assets_dir}/worker.ign.orig
+      jq -s '.[0] * .[1]' ${IGNITION_EXTRA} ${assets_dir}/worker.ign.orig | tee ${assets_dir}/worker.ign
+    fi
     $OPENSHIFT_INSTALLER --dir "${assets_dir}" --log-level=debug create cluster
 }