Remvoing config patch for old configs in upgrade and add/remove node (#…

…8296) * Remoing config patch for old configs in upgrade and add/remove node Signed-off-by: Arvinth C <[email protected]> * Trigger build Signed-off-by: Arvinth C <[email protected]> * Stash for save and sync config for upgrade flow Signed-off-by: Arvinth C <[email protected]> * Removing stash Signed-off-by: Arvinth C <[email protected]> --------- Signed-off-by: Arvinth C <[email protected]>
chef · Apr 16, 2024 · a485a1f · a485a1f
1 parent f973c15
commit a485a1f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/components/automate-backend-deployment/habitat/plan.sh b/components/automate-backend-deployment/habitat/plan.sh
@@ -27,7 +27,6 @@ pkg_deps=(
   chef/automate-ha-cluster-ctl
 )
 
-
 pkg_build_deps=(
   core/gcc
 )

diff --git a/components/automate-cli/cmd/chef-automate/initConfigHaTmpl.go b/components/automate-cli/cmd/chef-automate/initConfigHaTmpl.go
@@ -64,6 +64,8 @@ instance_count = ""
 # automate_setup_type = "automate"
 
 # teams_port = ""
+
+# config_file will be deprecated
 config_file = "configs/automate.toml"
 
 # Set enable_custom_certs = true to provide custom certificates during deployment
@@ -396,6 +398,7 @@ instance_count = ""
 ## === ===
 
 # teams_port = ""
+# config_file will be deprecated
 config_file = "configs/automate.toml"
 
 # Set enable_custom_certs = true to provide custom certificates during deployment

diff --git a/terraform/a2ha-terraform/modules/automate/templates/provision.sh.tpl b/terraform/a2ha-terraform/modules/automate/templates/provision.sh.tpl
@@ -294,8 +294,10 @@ if [ -e "/hab/user/deployment-service/config/user.toml" ]; then
 
    wait_for_upgrade
 
-  echo "Applying /etc/chef-automate/config.toml"
-  chef-automate config patch /etc/chef-automate/config.toml
+  # Below command is commented as patch is not required during upgrade and add/remove node
+  # Also when it is being applied, it was reverting patched configs (automate) to the older ones
+  # echo "Applying /etc/chef-automate/config.toml"
+  # chef-automate config patch /etc/chef-automate/config.toml
 
   echo "MAINTENANCE MODE OFF"
   chef-automate maintenance off
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,6 @@ pkg_deps=( @@
       chef/automate-ha-cluster-ctl
     )
     pkg_build_deps=(
       core/gcc
     )
@@ Expand Down @@