Skip to content

Commit ccb372b

Browse files
authored
feat: Update user_data to use proper cloudformation endpoint, update asg name to include tier (#22)
1 parent f189f43 commit ccb372b

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

source/lib/config/user_data/data_user_data

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ echo " >>druid>> starting apache druid $(date)"
6767
supervisord -c $DRUID_HOME/conf/supervisor/supervisord.conf
6868

6969
$PYTHON $DRUID_HOME/scripts/druid/check_druid_status.py --component-name data --graceful-termination-param-name {{GRACEFUL_TERMINATION_PARAM_NAME}} --base-url {{DRUID_BASE_URL}} --service-tier {{SERVICE_TIER}}
70-
cfn-signal -e $? --stack {{STACK_NAME}} --resource {{RESOURCE_NAME}} --region {{REGION}}
70+
cfn-signal -e $? --stack {{STACK_NAME}} --resource {{RESOURCE_NAME}} --region {{REGION}} --url https://cloudformation$($AWS_USE_FIPS_ENDPOINT && echo -fips).{{REGION}}.amazonaws.com

source/lib/config/user_data/historical_user_data

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ echo " >>druid>> starting apache druid $(date)"
5555
supervisord -c $DRUID_HOME/conf/supervisor/supervisord.conf
5656

5757
$PYTHON $DRUID_HOME/scripts/druid/check_druid_status.py --component-name historical --graceful-termination-param-name {{GRACEFUL_TERMINATION_PARAM_NAME}} --base-url {{DRUID_BASE_URL}} --service-tier {{SERVICE_TIER}}
58-
cfn-signal -e $? --stack {{STACK_NAME}} --resource {{RESOURCE_NAME}} --region {{REGION}}
58+
cfn-signal -e $? --stack {{STACK_NAME}} --resource {{RESOURCE_NAME}} --region {{REGION}} --url https://cloudformation$($AWS_USE_FIPS_ENDPOINT && echo -fips).{{REGION}}.amazonaws.com

source/lib/config/user_data/master_user_data

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ echo " >>druid>> starting apache druid $(date)"
4141
supervisord -c $DRUID_HOME/conf/supervisor/supervisord.conf
4242

4343
$PYTHON $DRUID_HOME/scripts/druid/check_druid_status.py --component-name master --graceful-termination-param-name {{GRACEFUL_TERMINATION_PARAM_NAME}} --base-url {{DRUID_BASE_URL}}
44-
cfn-signal -e $? --stack {{STACK_NAME}} --resource {{RESOURCE_NAME}} --region {{REGION}}
44+
cfn-signal -e $? --stack {{STACK_NAME}} --resource {{RESOURCE_NAME}} --region {{REGION}} --url https://cloudformation$($AWS_USE_FIPS_ENDPOINT && echo -fips).{{REGION}}.amazonaws.com

source/lib/config/user_data/middleManager_user_data

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ echo " >>druid>> starting apache druid $(date)"
4747
supervisord -c $DRUID_HOME/conf/supervisor/supervisord.conf
4848

4949
$PYTHON $DRUID_HOME/scripts/druid/check_druid_status.py --component-name middleManager --graceful-termination-param-name {{GRACEFUL_TERMINATION_PARAM_NAME}} --base-url {{DRUID_BASE_URL}}
50-
cfn-signal -e $? --stack {{STACK_NAME}} --resource {{RESOURCE_NAME}} --region {{REGION}}
50+
cfn-signal -e $? --stack {{STACK_NAME}} --resource {{RESOURCE_NAME}} --region {{REGION}} --url https://cloudformation$($AWS_USE_FIPS_ENDPOINT && echo -fips).{{REGION}}.amazonaws.com

source/lib/config/user_data/query_user_data

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ echo " >>druid>> starting apache druid $(date)"
4545
supervisord -c $DRUID_HOME/conf/supervisor/supervisord.conf
4646

4747
$PYTHON $DRUID_HOME/scripts/druid/check_druid_status.py --component-name query --graceful-termination-param-name {{GRACEFUL_TERMINATION_PARAM_NAME}} --base-url {{DRUID_BASE_URL}}
48-
cfn-signal -e $? --stack {{STACK_NAME}} --resource {{RESOURCE_NAME}} --region {{REGION}}
48+
cfn-signal -e $? --stack {{STACK_NAME}} --resource {{RESOURCE_NAME}} --region {{REGION}} --url https://cloudformation$($AWS_USE_FIPS_ENDPOINT && echo -fips).{{REGION}}.amazonaws.com

source/lib/config/user_data/zookeeper_user_data

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,4 +176,4 @@ echo "* * * * * sudo -u ${USER_NAME} $PYTHON $ZOOKEEPER_HOME/scripts/zkMetrics.p
176176
crontab /tmp/mycrontab
177177

178178
sh $ZOOKEEPER_HOME/scripts/health_check.sh $ENI_IP
179-
cfn-signal -e $? --stack {{STACK_NAME}} --resource {{RESOURCE_NAME}} --region {{REGION}}
179+
cfn-signal -e $? --stack {{STACK_NAME}} --resource {{RESOURCE_NAME}} --region {{REGION}} --url https://cloudformation$($AWS_USE_FIPS_ENDPOINT && echo -fips).{{REGION}}.amazonaws.com

source/lib/constructs/druidAutoScalingGroup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ export class DruidAutoScalingGroup extends Construct {
121121
});
122122
asg.addUserData(this.createUserData(props, instanceConfig, asg).render());
123123

124-
utils.addNameTag(asg, props.nodeType);
124+
utils.addNameTag(asg, nodeTierName);
125125
if (props.serviceTier) {
126126
utils.addTierTag(asg, props.serviceTier);
127127
}

0 commit comments

Comments
 (0)