Browse Source

Merge pull request #539 from mdr-engineering/feature/ftd_MSOCI-2002_qcontrol_and_fm_disabled_profiles

Disables Creation of Instance Profile on MC and Qcompliance SH
Frederick Damstra 3 years ago
parent
commit
7545e147c9

+ 7 - 3
bin/terragrunt-apply-all-everywhere

@@ -8,7 +8,7 @@ function argparse {
   while (( "$#" )); do
     case "$1" in
       -h|--help)
-        echo Usage: $0 '[-l|--local] [-t|--test] [-s|--skipqualys] [ENVFLAGS] [-d|--debug]'
+        echo Usage: $0 '[-l|--local] [-t|--test] [-s|--skipqualys] [-u|--upgrade] [ENVFLAGS] [-d|--debug]'
         echo "       where ENVFLAGS is one or more of --envprod, --envcommon, --envtest, or --envall. --envall is the default."
         exit 1
         ;;
@@ -56,6 +56,10 @@ function argparse {
         SKIPQUALYS="--skipqualys"
         shift
         ;;
+      -u|--upgrade)
+        UPGRADE="--upgrade"
+        shift
+        ;;
 #      -p|--only-path)
 #        if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
 #          ONLY_PATH=$2
@@ -134,10 +138,10 @@ for e in ${ENVS[*]}; do
 
       EXITCODE=1 # Assume error
       if [[ $DEBUG == 1 ]]; then
-        echo debug: Would run: terragrunt-apply-all $TESTING $REFRESH $LOCAL $NOTLOCAL $debugstr $SKIPQUALYS
+        echo debug: Would run: terragrunt-apply-all $TESTING $REFRESH $LOCAL $NOTLOCAL $UPGRADE $debugstr $SKIPQUALYS
         EXITCODE=$?
       else
-        terragrunt-apply-all $TESTING $REFRESH $LOCAL $NOTLOCAL $DEBUG $SKIPQUALYS
+        terragrunt-apply-all $TESTING $REFRESH $LOCAL $NOTLOCAL $UPGRADE $DEBUG $SKIPQUALYS
         EXITCODE=$?
       fi
 

+ 1 - 0
prod/aws-us-gov/mdr-prod-c2/190-splunk-fm-shared-search/terragrunt.hcl

@@ -47,6 +47,7 @@ inputs = {
   vpc_cidr = local.account_vars.locals.vpc_info["vpc-splunk"]["cidr"]
   azs = dependency.vpc.outputs.azs
   subnets = dependency.vpc.outputs.private_subnets
+  create_instance_profile = false
 }
 terraform_version_constraint = "= 1.0.7"
 terragrunt_version_constraint = "= 0.32.3"

+ 1 - 0
prod/aws-us-gov/mdr-prod-c2/190-splunk-mc/terragrunt.hcl

@@ -47,6 +47,7 @@ inputs = {
   vpc_cidr = local.account_vars.locals.vpc_info["vpc-splunk"]["cidr"]
   azs = dependency.vpc.outputs.azs
   subnets = dependency.vpc.outputs.private_subnets
+  create_instance_profile = false
 }
 terraform_version_constraint = "= 1.0.7"
 terragrunt_version_constraint = "= 0.32.3"

+ 1 - 0
prod/aws-us-gov/mdr-prod-c2/190-splunk-qcompliance-searchhead/terragrunt.hcl

@@ -40,6 +40,7 @@ inputs = {
   vpc_cidr = local.account_vars.locals.vpc_info["vpc-splunk"]["cidr"]
   azs = dependency.vpc.outputs.azs
   subnets = dependency.vpc.outputs.private_subnets
+  create_instance_profile = false
 }
 terraform_version_constraint = "= 1.0.7"
 terragrunt_version_constraint = "= 0.32.3"

+ 1 - 0
prod/aws-us-gov/mdr-prod-frtib/190-splunk-customer-searchhead/terragrunt.hcl

@@ -41,6 +41,7 @@ inputs = {
   azs = dependency.vpc.outputs.azs
   private_subnets = dependency.vpc.outputs.private_subnets
   public_subnets = dependency.vpc.outputs.public_subnets
+  create_instance_profile = false
 }
 terraform_version_constraint = "= 1.0.7"
 terragrunt_version_constraint = "= 0.32.3"