Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove task_checkpoint from cloud.rb #89

Merged
merged 2 commits into from
Mar 21, 2013
Merged

remove task_checkpoint from cloud.rb #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2113286
[fixes #46303813] first 5 and last 1 IP addresses in a VPC subnet are…
pmenglund Mar 19, 2013
a2f0460
[aws_cpi #46483687] remove task_checkpoint from helper
pmenglund Mar 19, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bosh_aws_bootstrap/spec/assets/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ vpc:
dhcp_options:
domain_name: dev102.cf.com
domain_name_servers:
- 10.10.0.5
- 10.10.0.6
- 172.16.0.23
security_groups:
- name: open
Expand Down
2 changes: 1 addition & 1 deletion bosh_aws_bootstrap/spec/assets/config_with_override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ vpc:
dhcp_options:
domain_name: dev102.cf.com
domain_name_servers:
- 10.10.0.5
- 10.10.0.6
- 172.16.0.23
security_groups:
- name: open
Expand Down
2 changes: 1 addition & 1 deletion bosh_aws_bootstrap/spec/assets/create_all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ vpc:
dhcp_options:
domain_name: CHANGEME.cf-app.com
domain_name_servers:
- 10.10.0.5
- 10.10.0.6
- 172.16.0.23
security_groups:
- name: open
Expand Down
2 changes: 1 addition & 1 deletion bosh_aws_bootstrap/spec/assets/test-output.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ original_configuration:
dhcp_options:
domain_name: dev102.cf.com
domain_name_servers:
- 10.10.0.5
- 10.10.0.6
- 172.16.0.23
security_groups:
- name: open
Expand Down
2 changes: 1 addition & 1 deletion bosh_aws_bootstrap/spec/unit/bosh_manifest_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
- range: 10.10.0.0/24
gateway: 10.10.0.1
dns:
- 10.10.0.5
- 10.10.0.6
cloud_properties:
subnet: subnet-4bdf6c26
- name: vip_network
Expand Down
2 changes: 1 addition & 1 deletion bosh_aws_bootstrap/templates/aws_configuration_template.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ vpc:
availability_zone: <%= ENV["BOSH_VPC_SECONDARY_AZ"] || raise("Missing ENV variable BOSH_VPC_SECONDARY_AZ") %>
dhcp_options:
domain_name_servers:
- 10.10.0.5 # IP of the BOSH DNS server?
- 10.10.0.6 # IP of the BOSH DNS server?
- 10.10.0.2 # local amazon public DNS server
security_groups:
- name: open
Expand Down
2 changes: 1 addition & 1 deletion bosh_aws_bootstrap/templates/bosh.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ networks:
- range: 10.10.0.0/24
gateway: 10.10.0.1
dns:
- 10.10.0.5
- 10.10.0.6
cloud_properties:
subnet: <%= subnet %>
- name: vip_network
Expand Down
8 changes: 4 additions & 4 deletions bosh_aws_bootstrap/templates/micro_bosh.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ logging:
network:
type: manual
vip: <%= vip %>
ip: 10.10.0.5
ip: 10.10.0.6
cloud_properties:
subnet: <%= subnet %>

Expand All @@ -31,12 +31,12 @@ cloud:
apply_spec:
agent:
blobstore:
address: 10.10.0.5
address: 10.10.0.6
nats:
address: 10.10.0.5
address: 10.10.0.6
properties:
registry:
address: 10.10.0.5
address: 10.10.0.6
aws:
access_key_id: <%= access_key_id %>
secret_access_key: <%= secret_access_key %>
Expand Down
1 change: 0 additions & 1 deletion bosh_aws_cpi/lib/cloud/aws/cloud.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,6 @@ def delete_disk(disk_id)
errors = [AWS::EC2::Errors::Client::VolumeInUse]

Bosh::Common.retryable(tries: tries, sleep: sleep_cb, on: errors, ensure: ensure_cb) do
task_checkpoint
volume.delete
true # return true to only retry on Exceptions
end
Expand Down
4 changes: 0 additions & 4 deletions bosh_aws_cpi/lib/cloud/aws/helpers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ def extract_security_group_names(networks_spec)
sort.
uniq
end

def task_checkpoint
Bosh::Clouds::Config.task_checkpoint
end
end
end

1 change: 0 additions & 1 deletion bosh_aws_cpi/spec/unit/delete_disk_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
cloud = mock_cloud(options) do |ec2|
ec2.volumes.stub(:[]).with("v-foo").and_return(volume)
end
cloud.stub(:task_checkpoint)

volume.stub(:state => :available)
volume.should_receive(:delete)
Expand Down
2 changes: 1 addition & 1 deletion spec/assets/aws/deployments/micro/micro_bosh.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ logging:

network:
type: manual
ip: 10.10.0.5
ip: 10.10.0.6
vip: <%= ENV["MICROBOSH_IP"] %>
cloud_properties:
subnet: <%= ENV["BOSH_SUBNET_ID"] %>
Expand Down
2 changes: 1 addition & 1 deletion spec/external/aws_bootstrap_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
end

it "assigns DHCP options" do
vpc.dhcp_options.configuration[:domain_name_servers].should =~ ['10.10.0.5', '10.10.0.2']
vpc.dhcp_options.configuration[:domain_name_servers].should =~ ['10.10.0.6', '10.10.0.2']
end

it "assigns security groups" do
Expand Down