Created
November 30, 2015 11:53
-
-
Save ares/4bf685dd6f29c0f5709b to your computer and use it in GitHub Desktop.
openstack patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/models/compute_resources/foreman/model/openstack.rb b/app/models/compute_resources/foreman/model/openstack.rb | |
index d273cfb..fa998b9 100644 | |
--- a/app/models/compute_resources/foreman/model/openstack.rb | |
+++ b/app/models/compute_resources/foreman/model/openstack.rb | |
@@ -77,6 +77,7 @@ module Foreman::Model | |
boot_from_volume(args) if Foreman::Cast.to_bool(args[:boot_from_volume]) | |
network = args.delete(:network) | |
# fix internal network format for fog. | |
+ args[:nics] ||= [] | |
args[:nics].delete_if(&:blank?) | |
args[:nics].map! {|nic| { 'net_id' => nic } } | |
vm = super(args) | |
diff --git a/bundler.d/fog.rb b/bundler.d/fog.rb | |
index 2e79443..d5a79d0 100644 | |
--- a/bundler.d/fog.rb | |
+++ b/bundler.d/fog.rb | |
@@ -1,3 +1,3 @@ | |
group :fog do | |
- gem 'fog', '1.36.0', :require => false | |
+ gem 'fog', '1.35.0', :require => false | |
end | |
diff --git a/bundler.d/gce.rb b/bundler.d/gce.rb | |
index b99f082..f0c0d59 100644 | |
--- a/bundler.d/gce.rb | |
+++ b/bundler.d/gce.rb | |
@@ -1,5 +1,5 @@ | |
group :gce do | |
- gem 'fog-google', '<= 0.1.0' | |
+ gem 'fog-google', '~> 0.1.0' | |
gem 'google-api-client', '>= 0.7', '< 0.9', :require => 'google/api_client' | |
gem 'sshkey', '~> 1.3' | |
end |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment