From e863edfe3f47401a5a193f27d48f227adc807edc Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 1 Jul 2020 09:52:17 -0400 Subject: [PATCH] Correct a number of mistakes --- confluent_osdeploy/common/opt/confluent/bin/apiclient | 2 +- .../initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh | 2 +- confluent_osdeploy/el8/profiles/default/kickstart | 2 +- confluent_osdeploy/el8/profiles/default/scripts/pre.sh | 2 +- confluent_osdeploy/rhvh4/profiles/default/scripts/pre.sh | 2 +- confluent_osdeploy/suse15/profiles/hpc/scripts/post.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/confluent_osdeploy/common/opt/confluent/bin/apiclient b/confluent_osdeploy/common/opt/confluent/bin/apiclient index ab8ee98d..7b69f64e 100644 --- a/confluent_osdeploy/common/opt/confluent/bin/apiclient +++ b/confluent_osdeploy/common/opt/confluent/bin/apiclient @@ -41,7 +41,7 @@ class HTTPSClient(client.HTTPConnection, object): if not os.path.exists('/tmp/confluent.ifidx') and '%' in host: ifidx = host.split('%', 1)[1] with open('/tmp/confluent.ifidx', 'w+') as ifout: - ifout.write(ifdx) + ifout.write(ifidx) self.stdheaders['CONFLUENT_APIKEY'] = get_apikey(node, host) if mgtiface: self.stdheaders['CONFLUENT_MGTIFACE'] = mgtiface diff --git a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh index 53e6a91f..5c1fd05a 100644 --- a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh +++ b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh @@ -4,7 +4,7 @@ echo -n "" > /tmp/confluent.initq TRIES=0 oum=$(umask) umask 0077 -mkdir -p /etc/confluennt +mkdir -p /etc/confluent umask $oum cd /sys/class/net while ! grep ^EXTMGRINFO: /etc/confluent/confluent.info | awk -F'|' '{print $3}' | grep 1 >& /dev/null && [ "$TRIES" -lt 60 ]; do diff --git a/confluent_osdeploy/el8/profiles/default/kickstart b/confluent_osdeploy/el8/profiles/default/kickstart index 0f78a8b5..4f35e9a7 100644 --- a/confluent_osdeploy/el8/profiles/default/kickstart +++ b/confluent_osdeploy/el8/profiles/default/kickstart @@ -50,7 +50,7 @@ curl -f https://$mgr/confluent-public/os/$profile/scripts/pre.sh > /tmp/preinst. %post --nochroot mkdir -p /mnt/sysimage/etc/confluent profile=$(grep ^profile: /etc/confluent/confluent.deploycfg |awk '{print $2}') -mgr=$(grep deploy_server /etc/confluent/confluennt.deploycfg |awk '{print $2}') +mgr=$(grep deploy_server /etc/confluent/confluent.deploycfg |awk '{print $2}') curl -f https://$mgr/confluent-public/os/$profile/scripts/prechroot.sh > /tmp/postinst.sh . /tmp/postinst.sh diff --git a/confluent_osdeploy/el8/profiles/default/scripts/pre.sh b/confluent_osdeploy/el8/profiles/default/scripts/pre.sh index b8c35ee3..2b042b7f 100644 --- a/confluent_osdeploy/el8/profiles/default/scripts/pre.sh +++ b/confluent_osdeploy/el8/profiles/default/scripts/pre.sh @@ -1,7 +1,7 @@ #!/bin/sh # This runs prior to the installer beginning. This is used to rewrite the -# scripted install file, merging data from confluennt and identifying +# scripted install file, merging data from confluent and identifying # the most appropriate install source. # If you want to use a more custom partition plan, the easiest diff --git a/confluent_osdeploy/rhvh4/profiles/default/scripts/pre.sh b/confluent_osdeploy/rhvh4/profiles/default/scripts/pre.sh index afee3f6c..63bc3289 100644 --- a/confluent_osdeploy/rhvh4/profiles/default/scripts/pre.sh +++ b/confluent_osdeploy/rhvh4/profiles/default/scripts/pre.sh @@ -1,7 +1,7 @@ #!/bin/sh # This runs prior to the installer beginning. This is used to rewrite the -# scripted install file, merging data from confluennt and identifying +# scripted install file, merging data from confluent and identifying # the most appropriate install source. # If you want to use a more custom partition plan, the easiest diff --git a/confluent_osdeploy/suse15/profiles/hpc/scripts/post.sh b/confluent_osdeploy/suse15/profiles/hpc/scripts/post.sh index 1ece9901..69cb1539 100644 --- a/confluent_osdeploy/suse15/profiles/hpc/scripts/post.sh +++ b/confluent_osdeploy/suse15/profiles/hpc/scripts/post.sh @@ -13,7 +13,7 @@ mgr=$(grep ^deploy_server /etc/confluent/confluent.deploycfg|awk '{print $2}') profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|sed -e 's/^profile: //') nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}') export mgr profile nodename -. /etc/confluennt/functions +. /etc/confluent/functions # Customizations may go here