From ae371aeaa94947da7aca74db1a015f9fd111fe88 Mon Sep 17 00:00:00 2001 From: punitmundra Date: Wed, 23 Nov 2022 18:39:40 +0530 Subject: [PATCH 1/3] remove the if check for BE nodes Signed-off-by: punitmundra --- .../a2ha-terraform/modules/habitat/templates/install_hab.sh.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/a2ha-terraform/modules/habitat/templates/install_hab.sh.tpl b/terraform/a2ha-terraform/modules/habitat/templates/install_hab.sh.tpl index d765ef25134..cee46227f33 100644 --- a/terraform/a2ha-terraform/modules/habitat/templates/install_hab.sh.tpl +++ b/terraform/a2ha-terraform/modules/habitat/templates/install_hab.sh.tpl @@ -129,7 +129,7 @@ tar xf ${aib_file} -C ${tmp_path}/aib_workspace || failure "Failed to extract ${ rsync -a --keep-dirlinks ${tmp_path}/aib_workspace/hab / # Copy the hab bin if it doesn't exist -[ ! -f /usr/bin/hab ] && rsync -a ${tmp_path}/aib_workspace/bin/hab /usr/bin +rsync -a ${tmp_path}/aib_workspace/bin/hab /usr/bin # TODO: remove this workaround once the following issue is resolved # https://github.com/habitat-sh/habitat/issues/6260 From 17ea86cd5ec2e8b398b52fe120e8b8152c3da621 Mon Sep 17 00:00:00 2001 From: punitmundra Date: Mon, 28 Nov 2022 11:53:14 +0530 Subject: [PATCH 2/3] update sym link instead of copy Signed-off-by: punitmundra --- .../modules/habitat/templates/install_hab.sh.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/a2ha-terraform/modules/habitat/templates/install_hab.sh.tpl b/terraform/a2ha-terraform/modules/habitat/templates/install_hab.sh.tpl index cee46227f33..4ed27bfc09f 100644 --- a/terraform/a2ha-terraform/modules/habitat/templates/install_hab.sh.tpl +++ b/terraform/a2ha-terraform/modules/habitat/templates/install_hab.sh.tpl @@ -129,8 +129,8 @@ tar xf ${aib_file} -C ${tmp_path}/aib_workspace || failure "Failed to extract ${ rsync -a --keep-dirlinks ${tmp_path}/aib_workspace/hab / # Copy the hab bin if it doesn't exist -rsync -a ${tmp_path}/aib_workspace/bin/hab /usr/bin - +#[ ! -f /usr/bin/hab ] && rsync -a ${tmp_path}/aib_workspace/bin/hab /usr/bin +ln -s ${tmp_path}/aib_workspace/bin/hab /bin/hab # TODO: remove this workaround once the following issue is resolved # https://github.com/habitat-sh/habitat/issues/6260 export LOGCMD='>>${tmp_path}/svc-load.log 2>&1' From f740a2bc2f84470ea8d4e8ebcc644e85d5585bfa Mon Sep 17 00:00:00 2001 From: punitmundra Date: Mon, 28 Nov 2022 12:09:27 +0530 Subject: [PATCH 3/3] bump the pkg Signed-off-by: punitmundra --- components/automate-backend-ctl/README.md | 3 +-- components/automate-backend-deployment/README.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/components/automate-backend-ctl/README.md b/components/automate-backend-ctl/README.md index b59c1a30548..8631812c0dd 100644 --- a/components/automate-backend-ctl/README.md +++ b/components/automate-backend-ctl/README.md @@ -12,5 +12,4 @@ Non-service package. ## Usage -`automate-backend-ctl help` - +`automate-backend-ctl help` \ No newline at end of file diff --git a/components/automate-backend-deployment/README.md b/components/automate-backend-deployment/README.md index 89827302285..896e2a23777 100644 --- a/components/automate-backend-deployment/README.md +++ b/components/automate-backend-deployment/README.md @@ -4,5 +4,4 @@ This provides the `automate-backend-deployment` package. This package will build a package using terraform/a2ha-terraform, inspecs, test, certs and Makefile. -This is the heart of the a2ha because this component will set up a workspace for a2ha and all the a2ha command will get available after installing this package. - +This is the heart of the a2ha because this component will set up a workspace for a2ha and all the a2ha command will get available after installing this package. \ No newline at end of file