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

adding missing m4,d2,t2,and g2 ebs encryption flavors #391

Merged
merged 1 commit into from
Dec 2, 2015
Merged

adding missing m4,d2,t2,and g2 ebs encryption flavors #391

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions lib/chef/knife/ec2_server_create.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,10 +824,12 @@ def validate!
if !locate_config_value(:flavor)
ui.error("--ebs-encrypted option requires valid flavor to be specified.")
exit 1
elsif (locate_config_value(:ebs_encrypted) and ! %w(m3.medium m3.large m3.xlarge m3.2xlarge c4.large c4.xlarge
elsif (locate_config_value(:ebs_encrypted) and ! %w(m3.medium m3.large m3.xlarge m3.2xlarge m4.large m4.xlarge
m4.2xlarge m4.4xlarge m4.10xlarge t2.micro t2.small t2.medium t2.large
d2.xlarge d2.2xlarge d2.4xlarge d2.8xlarge c4.large c4.xlarge
c4.2xlarge c4.4xlarge c4.8xlarge c3.large c3.xlarge c3.2xlarge
c3.4xlarge c3.8xlarge cr1.8xlarge r3.large r3.xlarge r3.2xlarge
r3.4xlarge r3.8xlarge i2.xlarge i2.2xlarge i2.4xlarge i2.8xlarge g2.2xlarge).include?(locate_config_value(:flavor)))
r3.4xlarge r3.8xlarge i2.xlarge i2.2xlarge i2.4xlarge i2.8xlarge g2.2xlarge g2.8xlarge).include?(locate_config_value(:flavor)))
ui.error("--ebs-encrypted option is not supported for #{locate_config_value(:flavor)} flavor.")
exit 1
end
Expand Down