@@ -95,22 +95,26 @@ async function install() {
9595 // Check to see if any cmd/env vars are passed that override install prompts.
9696 const promptOverride = checkForPromptOverride ( ) ;
9797 Object . assign ( promptOverride , configFromFile ) ;
98+ const hasRequiredPromptOverrides =
99+ promptOverride [ hdbTerms . INSTALL_PROMPTS . ROOTPATH ] &&
100+ promptOverride [ hdbTerms . INSTALL_PROMPTS . HDB_ADMIN_USERNAME ] &&
101+ promptOverride [ hdbTerms . INSTALL_PROMPTS . HDB_ADMIN_PASSWORD ] ;
102+
98103 if (
99- promptOverride [ hdbTerms . INSTALL_PROMPTS . REPLICATION_HOSTNAME ] &&
104+ hasRequiredPromptOverrides &&
105+ ! promptOverride [ hdbTerms . INSTALL_PROMPTS . REPLICATION_HOSTNAME ] &&
100106 ! promptOverride [ hdbTerms . INSTALL_PROMPTS . NODE_HOSTNAME ]
101107 ) {
102- promptOverride [ hdbTerms . INSTALL_PROMPTS . NODE_HOSTNAME ] =
103- promptOverride [ hdbTerms . INSTALL_PROMPTS . REPLICATION_HOSTNAME ] ;
108+ promptOverride [ hdbTerms . INSTALL_PROMPTS . NODE_HOSTNAME ] = null ;
109+ }
110+
111+ // REPLICATION_HOSTNAME was renamed to NODE_HOSTNAME in v5, but we still support the replication value if provided
112+ if ( promptOverride [ hdbTerms . INSTALL_PROMPTS . REPLICATION_HOSTNAME ] ) {
113+ promptOverride [ hdbTerms . INSTALL_PROMPTS . NODE_HOSTNAME ] = promptOverride [ hdbTerms . INSTALL_PROMPTS . REPLICATION_HOSTNAME ] ;
104114 }
105115
106116 // For backwards compatibility for a time before DEFAULTS_MODE (and host name) assume prod when these args used
107- if (
108- promptOverride [ hdbTerms . INSTALL_PROMPTS . ROOTPATH ] &&
109- promptOverride [ hdbTerms . INSTALL_PROMPTS . HDB_ADMIN_USERNAME ] &&
110- promptOverride [ hdbTerms . INSTALL_PROMPTS . HDB_ADMIN_PASSWORD ] &&
111- promptOverride [ hdbTerms . INSTALL_PROMPTS . NODE_HOSTNAME ] &&
112- promptOverride [ hdbTerms . INSTALL_PROMPTS . DEFAULTS_MODE ] === undefined
113- ) {
117+ if ( hasRequiredPromptOverrides && promptOverride [ hdbTerms . INSTALL_PROMPTS . DEFAULTS_MODE ] === undefined ) {
114118 promptOverride [ hdbTerms . INSTALL_PROMPTS . DEFAULTS_MODE ] = 'prod' ;
115119 }
116120
0 commit comments