Merge pull request #736 from derekhiggins/ttyS0-console

Add console=ttyS0 to kernel params
metal3-io · Dec 14, 2020 · f62d238 · f62d238
2 parents 0fde063 + 256eedf
commit f62d238
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/docs/dev-setup.md b/docs/dev-setup.md
@@ -79,6 +79,7 @@ The following environment variables can be passed to configure the ironic:
 - CACHEURL - the URL of the cached images
 - IRONIC_FAST_TRACK - whether to enable fast_track provisioning or not
  (default true)
+- IRONIC_KERNEL_PARAMS - Kernel parameters to pass to IPA (default console=ttyS0)
 
 In case you want to run the local ironic containers with TLS and basic
 authentication enabled, you also need to export the following variables:
@@ -219,7 +220,10 @@ spec:
 ## Using Bare Metal Hosts
 
 The `make-bm-worker` tool may be a more convenient way of creating
-YAML definitions for workers than editing the files directly.
+YAML definitions for workers than editing the files directly. If
+deploying baremetal hosts you might want to consider setting
+IRONIC_KERNEL_PARAMS="", when deploying ironic as the default directs
+the console to ttyS0 and is lost in Bare Metal Hosts.
 
 ```bash
 $ go run cmd/make-bm-worker/main.go -address 1.2.3.4 \

diff --git a/ironic-deployment/default/ironic_bmo_configmap.env b/ironic-deployment/default/ironic_bmo_configmap.env
@@ -7,3 +7,4 @@ IRONIC_ENDPOINT=http://172.22.0.2:6385/v1/
 IRONIC_INSPECTOR_ENDPOINT=http://172.22.0.2:5050/v1/
 CACHEURL=http://172.22.0.1/images
 IRONIC_FAST_TRACK=true
+IRONIC_KERNEL_PARAMS=console=ttyS0
diff --git a/ironic-deployment/keepalived/ironic_bmo_configmap.env b/ironic-deployment/keepalived/ironic_bmo_configmap.env
@@ -8,3 +8,4 @@ IRONIC_ENDPOINT=http://172.22.0.2:6385/v1/
 IRONIC_INSPECTOR_ENDPOINT=http://172.22.0.2:5050/v1/
 CACHEURL=http://172.22.0.1/images
 IRONIC_FAST_TRACK=true
+IRONIC_KERNEL_PARAMS=console=ttyS0
diff --git a/tools/run_local_ironic.sh b/tools/run_local_ironic.sh
@@ -15,6 +15,7 @@ PROVISIONING_IP="${PROVISIONING_IP:-"172.22.0.1"}"
 CLUSTER_PROVISIONING_IP="${CLUSTER_PROVISIONING_IP:-"172.22.0.2"}"
 PROVISIONING_INTERFACE="${PROVISIONING_INTERFACE:-"ironicendpoint"}"
 CLUSTER_DHCP_RANGE="${CLUSTER_DHCP_RANGE:-"172.22.0.10,172.22.0.100"}"
+IRONIC_KERNEL_PARAMS="${IRONIC_KERNEL_PARAMS:-"console=ttyS0"}"
 
 IRONIC_CACERT_FILE="${IRONIC_CACERT_FILE:-}"
 IRONIC_CERT_FILE="${IRONIC_CERT_FILE:-}"
@@ -64,6 +65,7 @@ IRONIC_ENDPOINT=${IRONIC_ENDPOINT}
 IRONIC_INSPECTOR_ENDPOINT=${IRONIC_INSPECTOR_ENDPOINT}
 CACHEURL=${CACHEURL}
 IRONIC_FAST_TRACK=${IRONIC_FAST_TRACK}
+IRONIC_KERNEL_PARAMS=${IRONIC_KERNEL_PARAMS}
 EOF
 
 sudo "${CONTAINER_RUNTIME}" pull "$IRONIC_IMAGE"