Skip to content
This repository has been archived by the owner on Jan 12, 2024. It is now read-only.

Commit

Permalink
Bugfix: Set vault address to be the internal DNS CNAMe for Vault (#58)
Browse files Browse the repository at this point in the history
* Set vault addr back to internal dns for Vault

* Update gradle version
  • Loading branch information
sdford authored Jul 27, 2017
1 parent a16f0e6 commit a0c7789
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@

group=com.nike
artifactId=cerberus-lifecycle-cli
version=3.0.0
version=3.0.1
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
import com.nike.cerberus.domain.backup.CerberusBackupMetadata;
import com.nike.cerberus.domain.backup.CerberusSdbMetadata;
import com.nike.cerberus.domain.environment.BackupRegionInfo;
import com.nike.cerberus.module.CerberusModule;
import com.nike.cerberus.operation.Operation;
import com.nike.cerberus.service.MetricsService;
import com.nike.cerberus.service.S3StoreService;
Expand All @@ -65,7 +64,6 @@
import org.slf4j.LoggerFactory;

import javax.inject.Inject;
import javax.inject.Named;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/nike/cerberus/store/ConfigStore.java
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,7 @@ public Properties getCmsSystemProperties() {

final BaseOutputs baseOutputs = getBaseStackOutputs();
final BaseParameters baseParameters = getBaseStackParameters();
final VaultParameters vaultParameters = getVaultStackParamters();
final Optional<String> cmsVaultToken = getCmsVaultToken();
final Optional<String> cmsDatabasePassword = getCmsDatabasePassword();

Expand All @@ -578,7 +579,7 @@ public Properties getCmsSystemProperties() {
final String rootUserArn = String.format("arn:aws:iam::%s:root", callerIdentity.getAccount());

final Properties properties = new Properties();
properties.put(VAULT_ADDR_KEY, getCerberusBaseUrl());
properties.put(VAULT_ADDR_KEY, String.format("https://%s", cnameToHost(vaultParameters.getCname())));
properties.put(VAULT_TOKEN_KEY, cmsVaultToken.get());
properties.put(ROOT_USER_ARN_KEY, rootUserArn);
properties.put(ADMIN_ROLE_ARN_KEY, baseParameters.getAccountAdminArn());
Expand Down

0 comments on commit a0c7789

Please sign in to comment.