Permalink
Browse files

Default to base stemcell 0.7.0 [fixes #123]

This is until there are new stable stemcells (1.5.0)
  • Loading branch information...
1 parent 5bc31fd commit 00d3b965e74fd3361a96d2ff6b555298d0755963 @drnic drnic committed Feb 25, 2013
@@ -61,7 +61,7 @@ def add_core_jobs_to_manifest(manifest)
# size: 2
# stemcell:
# name: bosh-stemcell
- # version: 0.6.4
+ # version: 0.7.0
# cloud_properties:
# instance_type: m1.xlarge
def add_resource_pools_to_manifest(manifest)
@@ -74,7 +74,7 @@ def add_core_jobs_to_manifest(manifest)
# size: 2
# stemcell:
# name: bosh-stemcell
- # version: 0.6.4
+ # version: 0.7.0
# cloud_properties:
# instance_type: m1.xlarge
def add_resource_pools_to_manifest(manifest)
@@ -75,7 +75,7 @@ def add_core_jobs_to_manifest(manifest)
# size: 2
# stemcell:
# name: bosh-stemcell
- # version: 0.6.4
+ # version: 0.7.0
# cloud_properties:
# instance_type: m1.xlarge
def add_resource_pools_to_manifest(manifest)
@@ -111,7 +111,8 @@ def add_service_node(service_name, additional_count=1)
usage "cf upload stemcell"
desc "download/create stemcell & upload to BOSH"
# option "--stable", "Use latest stemcell; possibly not tagged stable"
- option "--latest", "Use latest stemcell; possibly not tagged stable [default]"
+ option "--latest", "Use latest stemcell; possibly not tagged stable"
+ option "--version VERSION", "Use base stemcell with specific version [default: 0.7.0]"
option "--custom", "Create custom stemcell from BOSH git source"
def upload_stemcell
stemcell_type = "stable" if options[:stable]
@@ -308,7 +309,7 @@ def confirm_or_upload_stemcell
return
end
end
- unless latest_bosh_stemcell_version
+ unless best_bosh_stemcell_version
if stemcell_name == DEFAULT_STEMCELL_NAME
say "Attempting to upload stemcell #{stemcell_name}..."
upload_stemcell
@@ -342,6 +343,13 @@ def confirm_release_name
end
end
+ # An attempt to choose the best base stemcell for the current
+ # BOSH. Currently it hardcodes a guess on the assumption that
+ # the BOSH is from 0.8.1; rather than current edge (1.5.0.preX)
+ def best_bosh_stemcell_version
+ "0.7.0"
+ end
+
# Largest version number BOSH stemcell ("bosh-stemcell")
# @return [String] version number, e.g. "0.6.7"
def latest_bosh_stemcell_version
@@ -33,7 +33,7 @@ resource_pools:
size: 1
stemcell:
name: bosh-stemcell
- version: 0.6.4
+ version: 0.7.0
cloud_properties:
instance_type: m1.small
persistent_disk: 16192
@@ -42,7 +42,7 @@ resource_pools:
size: 1
stemcell:
name: bosh-stemcell
- version: 0.6.4
+ version: 0.7.0
cloud_properties:
instance_type: m1.small
persistent_disk: 16192
@@ -33,7 +33,7 @@ resource_pools:
size: 1
stemcell:
name: bosh-stemcell
- version: 0.6.4
+ version: 0.7.0
cloud_properties:
instance_type: m1.small
persistent_disk: 16192
@@ -42,7 +42,7 @@ resource_pools:
size: 1
stemcell:
name: bosh-stemcell
- version: 0.6.4
+ version: 0.7.0
cloud_properties:
instance_type: m1.xlarge
persistent_disk: 16192
@@ -51,7 +51,7 @@ resource_pools:
size: 2
stemcell:
name: bosh-stemcell
- version: 0.6.4
+ version: 0.7.0
cloud_properties:
instance_type: m1.small
persistent_disk: 16192
@@ -33,7 +33,7 @@ resource_pools:
size: 1
stemcell:
name: bosh-stemcell
- version: 0.6.4
+ version: 0.7.0
cloud_properties:
instance_type: m1.small
persistent_disk: 16192
@@ -42,7 +42,7 @@ resource_pools:
size: 2
stemcell:
name: bosh-stemcell
- version: 0.6.4
+ version: 0.7.0
cloud_properties:
instance_type: m1.xlarge
jobs:
@@ -33,7 +33,7 @@ resource_pools:
size: 1
stemcell:
name: bosh-stemcell
- version: 0.6.4
+ version: 0.7.0
cloud_properties:
instance_type: m1.small
persistent_disk: 16192
@@ -33,7 +33,7 @@ resource_pools:
size: 1
stemcell:
name: bosh-stemcell
- version: 0.6.4
+ version: 0.7.0
cloud_properties:
instance_type: m1.small
persistent_disk: 16192
@@ -154,7 +154,7 @@ def generate_new_system(cmd = nil)
])
end
- cmd.should_receive(:bosh_stemcell_versions).exactly(4).times.and_return(['0.6.4'])
+ cmd.should_receive(:bosh_stemcell_versions).exactly(4).times.and_return(['0.7.0'])
cmd.should_receive(:render_system)
provider = Bosh::CloudFoundry::Providers::AWS.new
@@ -25,7 +25,7 @@
@system_config.release_name = 'appcloud'
@system_config.release_version = 'latest'
@system_config.stemcell_name = 'bosh-stemcell'
- @system_config.stemcell_version = '0.6.4'
+ @system_config.stemcell_version = '0.7.0'
@system_config.core_server_flavor = 'm1.small'
@system_config.core_ip = '1.2.3.4'
@system_config.root_dns = 'mycompany.com'

0 comments on commit 00d3b96

Please sign in to comment.