Merge pull request spinnaker#2 from spinnaker-netflix/enabling-titan

Adding titan credentials
tomaslin · Oct 2, 2015 · 02389ef · 02389ef
2 parents d9678d0 + 8126bb4
commit 02389ef
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/root/apps/clouddriver/config/clouddriver.yml b/root/apps/clouddriver/config/clouddriver.yml
@@ -83,6 +83,15 @@ aws:
   defaultKeyPairTemplate: nf-{{name}}-keypair-a
   defaultFront50Template: http://front50.prod.netflix.net/{{name}}
 
+titan:
+  enabled: false
+  accounts:
+    - name: titantest
+      regions:
+        - name: us-east-1
+          endpoint: http://titanapi.test.netflix.net
+          calypsoEndpoint: http://calypso.us-east-1.dyntest.netflix.net:7001
+
 logging:
   config: classpath:logback-defaults.xml
 
@@ -220,6 +229,14 @@ aws:
 
 ---
 
+spring:
+  profiles: prestaging
+
+titan:
+  enabled: true
+
+---
+
 spring:
   profiles: test
 

diff --git a/root/service/clouddriver/run b/root/service/clouddriver/run
@@ -72,7 +72,7 @@ JAVA_OPTS="$EXTRA_OPTS \
     -Dnetflix.stack=$NETFLIX_STACK \
     -Dnetflix.appinfo.stack=$NETFLIX_STACK \
     -Dnetflix.account=$NETFLIX_ACCOUNT \
-    -Dspring.profiles.active=$NETFLIX_ACCOUNT \
+    -Dspring.profiles.active=$NETFLIX_ACCOUNT,$NETFLIX_STACK \
     -Dcaching.writeEnabled=$CACHE_WRITE"
 
 cd /apps/${servicename}/config