fix(bake): Rely on artifact name, not service name for baking (#1594)

spinnaker · Apr 21, 2017 · 20db4e3 · 20db4e3
1 parent d8bceae
commit 20db4e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dev/build_google_component_image.sh b/dev/build_google_component_image.sh
@@ -245,7 +245,7 @@ function fix_defaults() {
 
 process_args "$@"
 
-declare -a COMPONENTS=('clouddriver' 'deck' 'echo' 'fiat' 'front50' 'gate' 'igor' 'orca' 'rosco' 'consul-server' 'vault-server' 'redis')
+declare -a COMPONENTS=('clouddriver' 'deck' 'echo' 'fiat' 'front50' 'gate' 'igor' 'orca' 'rosco' 'consul' 'vault' 'redis')
 TIME_DECORATOR=$(date +%Y%m%d%H%M%S)
 ZONE=us-central1-f
 BASE_IMAGE_OR_FAMILY=ubuntu-1404-lts

diff --git a/dev/halyard_install_component.sh b/dev/halyard_install_component.sh
@@ -64,7 +64,7 @@ function process_args() {
   done
 }
 
-EXTERNAL_SERVICES=(vault-server consul-server redis)
+EXTERNAL_ARTIFACTS=(vault consul redis)
 
 function contains() {
   local e
@@ -82,7 +82,7 @@ function main() {
   hal config deploy edit --type BakeDebian
 
   local service_names
-  if contains $COMPONENT "${EXTERNAL_SERVICES[@]}"; then
+  if contains $COMPONENT "${EXTERNAL_ARTIFACTS[@]}"; then
     service_names=($COMPONENT)
   else 
     service_names=($COMPONENT monitoring-daemon vault-client consul-client)