diff --git a/confluent_osdeploy/el7/profiles/default/profile.yaml b/confluent_osdeploy/el7/profiles/default/profile.yaml index a582ad16..d0d79ec4 100644 --- a/confluent_osdeploy/el7/profiles/default/profile.yaml +++ b/confluent_osdeploy/el7/profiles/default/profile.yaml @@ -1,2 +1,3 @@ label: %%DISTRO%% %%VERSION%% %%ARCH%% (Default Profile) kernelargs: quiet +#installedargs: example # These arguments would be added to the installed system diff --git a/confluent_osdeploy/el7/profiles/default/scripts/pre.sh b/confluent_osdeploy/el7/profiles/default/scripts/pre.sh index 715d3757..7899a42a 100644 --- a/confluent_osdeploy/el7/profiles/default/scripts/pre.sh +++ b/confluent_osdeploy/el7/profiles/default/scripts/pre.sh @@ -28,11 +28,19 @@ if [ "$rootpw" = null ]; then else echo "rootpw --iscrypted $rootpw" > /tmp/rootpw fi +curl -f https://$mgr/confluent-public/os/$profile/profile.yaml > /tmp/instprofile.yaml +blargs=$(grep ^installedargs: /tmp/instprofile.yaml | sed -e 's/#.*//' -e 's/%installedargs: //') +if [ ! -z "$blargs" ]; then + blargs=' --append="'$blargs'"' +fi grubpw=$(grep ^grubpassword /etc/confluent/confluent.deploycfg | awk '{print $2}') if [ "$grubpw" = "null" ]; then touch /tmp/grubpw else - echo "bootloader --iscrypted --password=$grubpw" > /tmp/grubpw + blargs=" --iscrypted --password=$grubpw $blargs" +fi +if [ ! -z "$blargs" ]; then + echo "bootloader $blargs" > /tmp/grubpw fi ssh-keygen -A for pubkey in /etc/ssh/ssh_host_*_key.pub; do diff --git a/confluent_osdeploy/el8/profiles/default/profile.yaml b/confluent_osdeploy/el8/profiles/default/profile.yaml index a582ad16..265237a5 100644 --- a/confluent_osdeploy/el8/profiles/default/profile.yaml +++ b/confluent_osdeploy/el8/profiles/default/profile.yaml @@ -1,2 +1,3 @@ label: %%DISTRO%% %%VERSION%% %%ARCH%% (Default Profile) -kernelargs: quiet +kernelargs: quiet # These arguments are passed to the installer +#installedargs: example # These arguments would be added to the installed system diff --git a/confluent_osdeploy/el8/profiles/default/scripts/pre.sh b/confluent_osdeploy/el8/profiles/default/scripts/pre.sh index 28413741..2c9f005b 100644 --- a/confluent_osdeploy/el8/profiles/default/scripts/pre.sh +++ b/confluent_osdeploy/el8/profiles/default/scripts/pre.sh @@ -34,11 +34,19 @@ if [ "$rootpw" = null ]; then else echo "rootpw --iscrypted $rootpw" > /tmp/rootpw fi +curl -f https://$mgr/confluent-public/os/$profile/profile.yaml > /tmp/instprofile.yaml +blargs=$(grep ^installedargs: /tmp/instprofile.yaml | sed -e 's/#.*//' -e 's/%installedargs: //') +if [ ! -z "$blargs" ]; then + blargs=' --append="'$blargs'"' +fi grubpw=$(grep ^grubpassword /etc/confluent/confluent.deploycfg | awk '{print $2}') if [ "$grubpw" = "null" ]; then touch /tmp/grubpw else - echo "bootloader --iscrypted --password=$grubpw" > /tmp/grubpw + blargs=" --iscrypted --password=$grubpw $blargs" +fi +if [ ! -z "$blargs" ]; then + echo "bootloader $blargs" > /tmp/grubpw fi for pubkey in /etc/ssh/ssh_host*key.pub; do certfile=${pubkey/.pub/-cert.pub} diff --git a/confluent_osdeploy/rhvh4/profiles/default/profile.yaml b/confluent_osdeploy/rhvh4/profiles/default/profile.yaml index a582ad16..d0d79ec4 100644 --- a/confluent_osdeploy/rhvh4/profiles/default/profile.yaml +++ b/confluent_osdeploy/rhvh4/profiles/default/profile.yaml @@ -1,2 +1,3 @@ label: %%DISTRO%% %%VERSION%% %%ARCH%% (Default Profile) kernelargs: quiet +#installedargs: example # These arguments would be added to the installed system diff --git a/confluent_osdeploy/rhvh4/profiles/default/scripts/pre.sh b/confluent_osdeploy/rhvh4/profiles/default/scripts/pre.sh index ebda5efe..f6df01ef 100644 --- a/confluent_osdeploy/rhvh4/profiles/default/scripts/pre.sh +++ b/confluent_osdeploy/rhvh4/profiles/default/scripts/pre.sh @@ -42,11 +42,19 @@ if [ "$rootpw" = null ]; then else echo "rootpw --iscrypted $rootpw" > /tmp/rootpw fi +curl -f https://$mgr/confluent-public/os/$profile/profile.yaml > /tmp/instprofile.yaml +blargs=$(grep ^installedargs: /tmp/instprofile.yaml | sed -e 's/#.*//' -e 's/%installedargs: //') +if [ ! -z "$blargs" ]; then + blargs=' --append="'$blargs'"' +fi grubpw=$(grep ^grubpassword /etc/confluent/confluent.deploycfg | awk '{print $2}') if [ "$grubpw" = "null" ]; then touch /tmp/grubpw else - echo "bootloader --iscrypted --password=$grubpw" > /tmp/grubpw + blargs=" --iscrypted --password=$grubpw $blargs" +fi +if [ ! -z "$blargs" ]; then + echo "bootloader $blargs" > /tmp/grubpw fi ssh-keygen -A for pubkey in /etc/ssh/ssh_host_*_key.pub; do