@@ -79,15 +79,15 @@ if [ "{{ .DELETE_SCRIPT }}" = "true" ]; then
79
79
fi
80
80
fi
81
81
82
- # 3.Get instance ID based on $HOSTNAME
82
+ # 3.Get instance ID based on node name
83
83
INSTANCE_ID=$(curl -s https://api.datacrunch.io/v1/instances \
84
84
--header "Authorization: Bearer $ACCESS_TOKEN" | \
85
- jq -r --arg HOSTNAME "$HOSTNAME " '.[] | select(.hostname == $HOSTNAME ) | .id')
85
+ jq -r --arg HOSTNAME "{{ .NODENAME }} " '.[] | select(.hostname == {{ .NODENAME }} ) | .id')
86
86
87
87
if [ -n "$INSTANCE_ID" ]; then
88
- echo "Instance ID for hostname $HOSTNAME is $INSTANCE_ID"
88
+ echo "Instance ID for hostname {{ .NODENAME }} is $INSTANCE_ID"
89
89
else
90
- echo "No instance found for hostname $HOSTNAME "
90
+ echo "No instance found for hostname {{ .NODENAME }} "
91
91
fi
92
92
`
93
93
)
@@ -527,7 +527,7 @@ func processPreScriptTemplate(preScriptTemplate string, data interface{}) (strin
527
527
return script .String (), nil
528
528
}
529
529
530
- func buildPreScript (n * datacrunchNodeGroup , scriptName string ) (string , error ) {
530
+ func buildPreScript (scriptName string , nodeName string ) (string , error ) {
531
531
// Get credentials from environment
532
532
clientID := os .Getenv ("DATACRUNCH_CLIENT_ID" )
533
533
clientSecret := os .Getenv ("DATACRUNCH_CLIENT_SECRET" )
@@ -544,6 +544,7 @@ func buildPreScript(n *datacrunchNodeGroup, scriptName string) (string, error) {
544
544
"DATACRUNCH_CLIENT_SECRET" : clientSecret ,
545
545
"SCRIPT_NAME" : scriptName ,
546
546
"DELETE_SCRIPT" : fmt .Sprintf ("%t" , deleteScriptsAfterBoot ),
547
+ "NODENAME" : nodeName ,
547
548
}
548
549
549
550
// Process the template
@@ -630,7 +631,7 @@ func createServer(n *datacrunchNodeGroup) error {
630
631
631
632
if startupScript != "" {
632
633
// Build pre-script from template
633
- preScript , err := buildPreScript (n , startupScriptName )
634
+ preScript , err := buildPreScript (startupScriptName , nodeName )
634
635
if err != nil {
635
636
return fmt .Errorf ("failed to build pre-script: %v" , err )
636
637
}
0 commit comments