fog-openstack 0.1.5 → 0.1.6

data/lib/fog/openstack/examples/network/network_add_port.rb

@@ -0,0 +1,21 @@
+require 'fog/openstack'
+
+# Add additional port to an Openstack node
+
+def create_virtual_address_pairing(username, password, auth_url, tenant, device_id, device_ip_address, network_id)
+  network_driver = Fog::Network.new(:provider           => :openstack,
+                                    :openstack_api_key  => password,
+                                    :openstack_username => username,
+                                    :openstack_auth_url => auth_url,
+                                    :openstack_tenant   => tenant)
+
+  virtual_ip_address = network_driver.create_port(network_id)
+
+  server_nics = network_driver.list_ports('device_id' => device_id).data[:body]['ports']
+  port = (server_nics.select do |network_port|
+    network_port['mac_address'] == server.attributes['macaddress']
+  end).first
+
+  network_driver.update_port(port['id'], :allowed_address_pairs => [{:ip_address => device_ip_address},
+                                                                    {:ip_address => virtual_ip_address}])
+end

data/lib/fog/openstack/examples/network/network_rbac.rb

@@ -0,0 +1,69 @@
+require 'fog/openstack'
+require 'pp'
+
+#
+# Creates a private network and shares it with another project via RBAC policy
+#
+# Needs to be in an environment where keystone v3 is available
+#
+# You will need to source OpenStack credentials since the script
+# reads the following envionment variables:
+#
+#  OS_AUTH_URL
+#  OS_PASSWORD
+#  OS_USERNAME
+#  OS_USER_DOMAIN_NAME
+#  OS_PROJECT_NAME
+#  OS_REGION_NAME
+#
+#  optionally disable SSL verification
+#  SSL_VERIFY=false
+
+auth_options = {
+  :openstack_auth_url     => "#{ENV['OS_AUTH_URL']}/auth/tokens",
+  :openstack_api_key      => ENV['OS_PASSWORD'],
+  :openstack_username     => ENV['OS_USERNAME'],
+  :openstack_domain_name  => ENV['OS_USER_DOMAIN_NAME'],
+  :openstack_project_name => ENV['OS_PROJECT_NAME'],
+  :openstack_region       => ENV['OS_REGION_NAME'],
+  :connection_options     => {:ssl_verify_peer => ENV['SSL_VERIFY'] != 'false'}
+}
+
+identity_service = Fog::Identity::OpenStack::V3.new(auth_options)
+network_service  = Fog::Network::OpenStack.new(auth_options)
+
+own_project   = identity_service.projects.select { |p| p.name == ENV['OS_PROJECT_NAME'] }.first
+other_project = identity_service.projects.select { |p| p.name != ENV['OS_PROJECT_NAME'] }.first
+
+puts "Create network in #{own_project.name}"
+foonet = network_service.networks.create(:name => 'foo-net23', :tenant_id => own_project.id)
+
+puts "Share network with #{other_project.name}"
+rbac = network_service.rbac_policies.create(
+  :object_type   => 'network',
+  :object_id     => foonet.id,
+  :tenant_id     => own_project.id,
+  :target_tenant => other_project.id,
+  :action        => 'access_as_shared'
+)
+
+puts "Get RBAC policy"
+rbac = network_service.rbac_policies.find_by_id(rbac.id)
+pp rbac
+
+puts "Change share to own project"
+rbac.target_tenant = own_project.id
+rbac.save
+
+puts "Get network and see that it is now shared"
+foonet = network_service.networks.get(foonet.id)
+pp foonet
+
+puts "Remove the share via RBAC"
+rbac.destroy
+
+puts "Get network and see that it is no longer shared"
+foonet.reload
+pp foonet
+
+foonet.destroy

data/lib/fog/openstack/identity.rb

@@ -11,19 +11,24 @@ module Fog
                  :openstack_user_domain, :openstack_project_domain,
                  :openstack_user_domain_id, :openstack_project_domain_id,
                  :openstack_api_key, :openstack_current_user_id, :openstack_userid, :openstack_username,
-                 :current_user, :current_user_id, :current_tenant,
+                 :current_user, :current_user_id, :current_tenant, :openstack_cache_ttl,
                  :provider, :openstack_identity_prefix, :openstack_endpoint_path_matches
 
-      # Fog::Identity::OpenStack.new() will return a Fog::Identity::OpenStack::V2 or a Fog::Identity::OpenStack::V3,
-      #  depending on whether the auth URL is for an OpenStack Identity V2 or V3 API endpoint
+      # Fog::Identity::OpenStack.new() will return a Fog::Identity::OpenStack::V3 by default
       def self.new(args = {})
-        if self.inspect == 'Fog::Identity::OpenStack'
-          identity = super
-          config = identity.config
-          service = identity.v3? ? Fog::Identity::OpenStack::V3.new(config) : Fog::Identity::OpenStack::V2.new(config)
-        else
-          service = Fog::Service.new(args)
+        version = '3'
+        url = Fog.credentials[:openstack_auth_url] || args[:openstack_auth_url]
+        if url
+          uri = URI(url)
+          version = '2.0' if uri.path =~ /v2\.0/
         end
+
+        service = case version
+                  when '2.0'
+                    Fog::Identity::OpenStack::V2.new(args)
+                  else
+                    Fog::Identity::OpenStack::V3.new(args)
+                  end
         service
       end
 
@@ -32,17 +37,8 @@ module Fog
 
         def initialize(options = {})
           @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
-          @openstack_identity_prefix = options[:openstack_identity_prefix]
           @config = options
         end
-
-        def v3?
-          if @openstack_identity_prefix
-            @openstack_identity_prefix =~ /v3/
-          else
-            @openstack_auth_uri && @openstack_auth_uri.path =~ %r{/v3}
-          end
-        end
       end
 
       class Real
@@ -80,10 +76,6 @@ module Fog
           @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
-        def v3?
-          @path && @path =~ %r{/v3}
-        end
-
         def config_service?
           true
         end

data/lib/fog/openstack/identity_v2.rb

@@ -13,7 +13,7 @@ module Fog
                    :openstack_tenant, :openstack_tenant_id,
                    :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
                    :current_user, :current_tenant, :openstack_region,
-                   :openstack_endpoint_type,
+                   :openstack_endpoint_type, :openstack_cache_ttl,
                    :openstack_project_name, :openstack_project_id,
                    :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
                    :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,

data/lib/fog/openstack/image_v1.rb

@@ -6,7 +6,6 @@ module Fog
   module Image
     class OpenStack
       class V1 < Fog::Service
-
         SUPPORTED_VERSIONS = /v1(\.(0|1))*/
 
         requires :openstack_auth_url
@@ -15,7 +14,7 @@ module Fog
                    :openstack_tenant, :openstack_tenant_id,
                    :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
                    :current_user, :current_tenant, :openstack_region,
-                   :openstack_endpoint_type,
+                   :openstack_endpoint_type, :openstack_cache_ttl,
                    :openstack_project_name, :openstack_project_id,
                    :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
                    :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,
@@ -55,7 +54,7 @@ module Fog
             @data = nil
           end
 
-          def initialize(options={})
+          def initialize(options = {})
             @openstack_username = options[:openstack_username]
             @openstack_tenant   = options[:openstack_tenant]
             @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
@@ -68,8 +67,8 @@ module Fog
             management_url.path = '/v1'
             @openstack_management_url = management_url.to_s
 
-            @data ||= { :users => {} }
-            unless @data[:users].find {|u| u['name'] == options[:openstack_username]}
+            @data ||= {:users => {}}
+            unless @data[:users].detect { |u| u['name'] == options[:openstack_username] }
               id = Fog::Mock.random_numbers(6).to_s
               @data[:users][id] = {
                 'id'       => id,
@@ -90,11 +89,11 @@ module Fog
           end
 
           def credentials
-            { :provider                 => 'openstack',
-              :openstack_auth_url       => @openstack_auth_uri.to_s,
-              :openstack_auth_token     => @auth_token,
-              :openstack_region         => @openstack_region,
-              :openstack_management_url => @openstack_management_url }
+            {:provider                 => 'openstack',
+             :openstack_auth_url       => @openstack_auth_uri.to_s,
+             :openstack_auth_token     => @auth_token,
+             :openstack_region         => @openstack_region,
+             :openstack_management_url => @openstack_management_url}
           end
         end
 
@@ -106,7 +105,7 @@ module Fog
           end
           include Fog::OpenStack::Common
 
-          def initialize(options={})
+          def initialize(options = {})
             initialize_identity options
 
             @openstack_service_type           = options[:openstack_service_type] || ['image']
@@ -117,30 +116,16 @@ module Fog
 
             authenticate
 
-            process_path @openstack_management_uri
             unless @path.match(SUPPORTED_VERSIONS)
               @path = Fog::OpenStack.get_supported_version_path(SUPPORTED_VERSIONS,
-                                                                 @openstack_management_uri,
-                                                                 @auth_token,
-                                                                 @connection_options)
+                                                                @openstack_management_uri,
+                                                                @auth_token,
+                                                                @connection_options)
             end
 
             @persistent = options[:persistent] || false
             @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
           end
-
-          def process_path uri
-            unless @path.match(SUPPORTED_VERSIONS)
-              @path = "/" + Fog::OpenStack.get_supported_version(SUPPORTED_VERSIONS,
-                                                                 uri,
-                                                                 @auth_token,
-                                                                 @connection_options)
-            end
-            @path
-          end
-
-          private
-
         end
       end
     end

data/lib/fog/openstack/image_v2.rb

@@ -6,7 +6,6 @@ module Fog
   module Image
     class OpenStack
       class V2 < Fog::Service
-
         SUPPORTED_VERSIONS = /v2(\.(0|1|2|3))*/
 
         requires :openstack_auth_url
@@ -15,7 +14,7 @@ module Fog
                    :openstack_tenant, :openstack_tenant_id,
                    :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
                    :current_user, :current_tenant, :openstack_region,
-                   :openstack_endpoint_type,
+                   :openstack_endpoint_type, :openstack_cache_ttl,
                    :openstack_project_name, :openstack_project_id,
                    :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
                    :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,
@@ -61,7 +60,7 @@ module Fog
             @data = nil
           end
 
-          def initialize(options={})
+          def initialize(options = {})
             @openstack_username = options[:openstack_username]
             @openstack_tenant   = options[:openstack_tenant]
             @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
@@ -74,8 +73,8 @@ module Fog
             management_url.path = '/v2'
             @openstack_management_url = management_url.to_s
 
-            @data ||= { :users => {} }
-            unless @data[:users].find {|u| u['name'] == options[:openstack_username]}
+            @data ||= {:users => {}}
+            unless @data[:users].detect { |u| u['name'] == options[:openstack_username] }
               id = Fog::Mock.random_numbers(6).to_s
               @data[:users][id] = {
                 'id'       => id,
@@ -96,13 +95,15 @@ module Fog
           end
 
           def credentials
-            { :provider                 => 'openstack',
-              :openstack_auth_url       => @openstack_auth_uri.to_s,
-              :openstack_auth_token     => @auth_token,
-              :openstack_region         => @openstack_region,
-              :openstack_management_url => @openstack_management_url }
+            {:provider                 => 'openstack',
+             :openstack_auth_url       => @openstack_auth_uri.to_s,
+             :openstack_auth_token     => @auth_token,
+             :openstack_region         => @openstack_region,
+             :openstack_management_url => @openstack_management_url}
           end
         end
+        class Upload # Exists for image_v2_upload_spec "describe"
+        end
 
         class Real
           include Fog::OpenStack::Core
@@ -111,7 +112,7 @@ module Fog
           end
           include Fog::OpenStack::Common
 
-          def initialize(options={})
+          def initialize(options = {})
             initialize_identity options
 
             @openstack_service_type           = options[:openstack_service_type] || ['image']
@@ -124,17 +125,14 @@ module Fog
 
             unless @path.match(SUPPORTED_VERSIONS)
               @path = Fog::OpenStack.get_supported_version_path(SUPPORTED_VERSIONS,
-                                                                 @openstack_management_uri,
-                                                                 @auth_token,
-                                                                 @connection_options)
+                                                                @openstack_management_uri,
+                                                                @auth_token,
+                                                                @connection_options)
             end
 
             @persistent = options[:persistent] || false
             @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
           end
-
-          private
-
         end
       end
     end

data/lib/fog/openstack/introspection.rb

@@ -11,7 +11,7 @@ module Fog
                  :openstack_tenant, :openstack_tenant_id,
                  :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
                  :current_user, :current_tenant, :openstack_region,
-                 :openstack_endpoint_type,
+                 :openstack_endpoint_type, :openstack_cache_ttl,
                  :openstack_project_name, :openstack_project_id,
                  :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
                  :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id

data/lib/fog/openstack/metering.rb

@@ -9,7 +9,7 @@ module Fog
                  :openstack_tenant, :openstack_tenant_id,
                  :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
                  :current_user, :current_tenant, :openstack_region,
-                 :openstack_endpoint_type,
+                 :openstack_endpoint_type, :openstack_cache_ttl,
                  :openstack_project_name, :openstack_project_id,
                  :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
                  :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,

data/lib/fog/openstack/models/collection.rb

@@ -34,7 +34,10 @@ module Fog
       def get(uuid)
         raise Fog::OpenStack::Errors::InterfaceNotImplemented.new('Method :get is not implemented')
       end
-      alias_method :find_by_id, :get
+
+      def find_by_id(uuid)
+        get(uuid)
+      end
 
       # Destroys record given record's UUID
       def destroy(uuid)

data/lib/fog/openstack/models/compute/availability_zone.rb

@@ -7,7 +7,12 @@ module Fog
         identity :zoneName
 
         attribute :hosts
+        attribute :zoneLabel
         attribute :zoneState
+
+        def to_s
+          zoneName
+        end
       end
     end
   end

data/lib/fog/openstack/models/compute/flavor.rb

@@ -20,29 +20,41 @@ module Fog
 
         def save
           requires :name, :ram, :vcpus, :disk
-          attributes[:ephemeral] = self.ephemeral || 0
-          attributes[:is_public] = self.is_public || false
-          attributes[:disabled] = self.disabled || false
-          attributes[:swap] = self.swap || 0
-          attributes[:rxtx_factor] = self.rxtx_factor || 1.0
-          merge_attributes(service.create_flavor(self.attributes).body['flavor'])
+          attributes[:ephemeral] = ephemeral || 0
+          attributes[:is_public] = is_public || false
+          attributes[:disabled] = disabled || false
+          attributes[:swap] = swap || 0
+          attributes[:rxtx_factor] = rxtx_factor || 1.0
+          merge_attributes(service.create_flavor(attributes).body['flavor'])
           self
         end
 
         def destroy
           requires :id
-          service.delete_flavor(self.id)
+          service.delete_flavor(id)
           true
         end
 
         def metadata
-          service.get_flavor_metadata(self.id).body['extra_specs']
+          service.get_flavor_metadata(id).body['extra_specs']
         rescue Fog::Compute::OpenStack::NotFound
           nil
         end
 
         def create_metadata(metadata)
-          service.create_flavor_metadata(self.id, metadata)
+          service.create_flavor_metadata(id, metadata)
+        rescue Fog::Compute::OpenStack::NotFound
+          nil
+        end
+
+        def update_metadata(key, value)
+          service.update_flavor_metadata(id, key, value)
+        rescue Fog::Compute::OpenStack::NotFound
+          nil
+        end
+
+        def delete_metadata(key)
+          service.delete_flavor_metadata(id, key)
         rescue Fog::Compute::OpenStack::NotFound
           nil
         end

data/lib/fog/openstack/models/compute/server.rb

@@ -10,7 +10,7 @@ module Fog
 
         attribute :addresses
         attribute :flavor
-        attribute :host_id,     :aliases => 'hostId'
+        attribute :host_id, :aliases => 'hostId'
         attribute :image
         attribute :metadata
         attribute :links
@@ -18,7 +18,8 @@ module Fog
 
         # @!attribute [rw] personality
         # @note This attribute is only used for server creation. This field will be nil on subsequent retrievals.
-        # @return [Hash] Hash containing data to inject into the file system of the cloud server instance during server creation.
+        # @return [Hash] Hash containing data to inject into the file system of the cloud server instance during
+        #                server creation.
         # @example To inject fog.txt into file system
         #   :personality => [{ :path => '/root/fog.txt',
         #                      :contents => Base64.encode64('Fog was here!')
@@ -52,11 +53,11 @@ module Fog
         attr_writer :image_ref, :flavor_ref, :nics, :os_scheduler_hints
         attr_accessor :block_device_mapping, :block_device_mapping_v2
 
-        # In some cases it's handy to be able to store the project for the record, e.g. swift doesn't contain project info
-        # in the result, so we can track it in this attribute based on what project was used in the request
+        # In some cases it's handy to be able to store the project for the record, e.g. swift doesn't contain project
+        # info in the result, so we can track it in this attribute based on what project was used in the request
         attr_accessor :project
 
-        def initialize(attributes={})
+        def initialize(attributes = {})
           # Old 'connection' is renamed as service and should be used instead
           prepare_service_value(attributes)
 
@@ -73,17 +74,15 @@ module Fog
 
         def metadata
           @metadata ||= begin
-            Fog::Compute::OpenStack::Metadata.new({
-              :service => service,
-              :parent => self
-            })
+            Fog::Compute::OpenStack::Metadata.new(:service => service,
+                                                  :parent  => self)
           end
         end
 
-        def metadata=(new_metadata={})
+        def metadata=(new_metadata = {})
           return unless new_metadata
           metas = []
-          new_metadata.each_pair {|k,v| metas << {"key" => k, "value" => v} }
+          new_metadata.each_pair { |k, v| metas << {"key" => k, "value" => v} }
           @metadata = metadata.load(metas)
         end
 
@@ -106,7 +105,7 @@ module Fog
           # currently openstack API does not tell us what is a floating ip vs a fixed ip for the vm listing,
           # we fall back to get all addresses and filter sadly.
           # Only includes manually-assigned addresses, not auto-assigned
-          @all_addresses ||= service.list_all_addresses.body["floating_ips"].select{|data| data['instance_id'] == id}
+          @all_addresses ||= service.list_all_addresses.body["floating_ips"].select { |data| data['instance_id'] == id }
         end
 
         def reload
@@ -117,31 +116,38 @@ module Fog
         # returns all ip_addresses for a given instance
         # this includes both the fixed ip(s) and the floating ip(s)
         def ip_addresses
-          addresses.values.flatten.map{|x| x['addr']}
+          addresses ? addresses.values.flatten.collect { |x| x['addr'] } : []
         end
 
         def floating_ip_addresses
-          all_floating=addresses.values.flatten.select{ |data| data["OS-EXT-IPS:type"]=="floating" }.map{|addr| addr["addr"] }
+          all_floating = if addresses
+                           flattened_values = addresses.values.flatten
+                           flattened_values.select { |d| d["OS-EXT-IPS:type"] == "floating" }.collect { |a| a["addr"] }
+                         else
+                           []
+                         end
 
           # Return them all, leading with manually assigned addresses
-          manual = all_addresses.map{|addr| addr["ip"]}
+          manual = all_addresses.collect { |addr| addr["ip"] }
 
-          all_floating.sort{ |a,b|
+          all_floating.sort do |a, b|
             a_manual = manual.include? a
             b_manual = manual.include? b
 
-            if a_manual and !b_manual
+            if a_manual && !b_manual
               -1
-            elsif !a_manual and b_manual
+            elsif !a_manual && b_manual
               1
-            else 0 end
-          }
+            else
+              0
+            end
+          end
           all_floating.empty? ? manual : all_floating
         end
 
         def public_ip_addresses
           if floating_ip_addresses.empty?
-            addresses.find_all{|s| s[0] =~ /public/i}.map{|a| a[1][0]['addr']}
+            addresses.select { |s| s[0] =~ /public/i }.collect { |a| a[1][0]['addr'] }
           else
             floating_ip_addresses
           end
@@ -158,35 +164,27 @@ module Fog
         def private_ip_addresses
           rfc1918_regexp = /(^10\.|^172\.1[6-9]\.|^172\.2[0-9]\.|^172.3[0-1]\.|^192\.168\.)/
           almost_private = ip_addresses - public_ip_addresses - floating_ip_addresses
-          almost_private.find_all{ |ip| rfc1918_regexp.match ip }
+          almost_private.select { |ip| rfc1918_regexp.match ip }
         end
 
         def private_ip_address
           private_ip_addresses.first
         end
 
-        def image_ref
-          @image_ref
-        end
+        attr_reader :image_ref
 
-        def image_ref=(new_image_ref)
-          @image_ref = new_image_ref
-        end
+        attr_writer :image_ref
 
-        def flavor_ref
-          @flavor_ref
-        end
+        attr_reader :flavor_ref
 
-        def flavor_ref=(new_flavor_ref)
-          @flavor_ref = new_flavor_ref
-        end
+        attr_writer :flavor_ref
 
         def ready?
-          self.state == 'ACTIVE'
+          state == 'ACTIVE'
         end
 
         def failed?
-          self.state == 'ERROR'
+          state == 'ERROR'
         end
 
         def change_password(admin_password)
@@ -195,7 +193,7 @@ module Fog
           true
         end
 
-        def rebuild(image_ref, name, admin_pass=nil, metadata=nil, personality=nil)
+        def rebuild(image_ref, name, admin_pass = nil, metadata = nil, personality = nil)
           requires :id
           service.rebuild_server(id, image_ref, name, admin_pass, metadata, personality)
           true
@@ -225,13 +223,11 @@ module Fog
           groups = service.list_security_groups(:server_id => id).body['security_groups']
 
           groups.map do |group|
-            Fog::Compute::OpenStack::SecurityGroup.new group.merge({:service => service})
+            Fog::Compute::OpenStack::SecurityGroup.new group.merge(:service => service)
           end
         end
 
-        def security_groups=(new_security_groups)
-          @security_groups = new_security_groups
-        end
+        attr_writer :security_groups
 
         def reboot(type = 'SOFT')
           requires :id
@@ -282,7 +278,7 @@ module Fog
           service.shelve_offload_server(id)
         end
 
-        def create_image(name, metadata={})
+        def create_image(name, metadata = {})
           requires :id
           service.create_image(id, name, metadata)
         end
@@ -302,7 +298,7 @@ module Fog
           service.live_migrate_server(id, host, block_migration, disk_over_commit)
         end
 
-        def evacuate(host = nil, on_shared_storage = true, admin_password = nil)
+        def evacuate(host = nil, on_shared_storage = nil, admin_password = nil)
           requires :id
           service.evacuate_server(id, host, on_shared_storage, admin_password)
         end
@@ -322,13 +318,9 @@ module Fog
           service.reset_server_state id, vm_state
         end
 
-        def min_count=(new_min_count)
-          @min_count = new_min_count
-        end
+        attr_writer :min_count
 
-        def max_count=(new_max_count)
-          @max_count = new_max_count
-        end
+        attr_writer :max_count
 
         def networks
           service.networks(:server => self)
@@ -359,27 +351,27 @@ module Fog
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
+          raise Fog::Errors::Error, 'Resaving an existing object may create a duplicate' if persisted?
           requires :flavor_ref, :name
           requires_one :image_ref, :block_device_mapping, :block_device_mapping_v2
           options = {
-            'personality' => personality,
-            'accessIPv4' => accessIPv4,
-            'accessIPv6' => accessIPv6,
-            'availability_zone' => availability_zone,
-            'user_data' => user_data_encoded,
-            'key_name'    => key_name,
-            'config_drive' => config_drive,
-            'security_groups' => @security_groups,
-            'min_count'   => @min_count,
-            'max_count'   => @max_count,
-            'nics' => @nics,
-            'os:scheduler_hints' => @os_scheduler_hints,
-            'block_device_mapping' => @block_device_mapping,
+            'personality'             => personality,
+            'accessIPv4'              => accessIPv4,
+            'accessIPv6'              => accessIPv6,
+            'availability_zone'       => availability_zone,
+            'user_data'               => user_data_encoded,
+            'key_name'                => key_name,
+            'config_drive'            => config_drive,
+            'security_groups'         => @security_groups,
+            'min_count'               => @min_count,
+            'max_count'               => @max_count,
+            'nics'                    => @nics,
+            'os:scheduler_hints'      => @os_scheduler_hints,
+            'block_device_mapping'    => @block_device_mapping,
             'block_device_mapping_v2' => @block_device_mapping_v2,
           }
           options['metadata'] = metadata.to_hash unless @metadata.nil?
-          options = options.reject {|key, value| value.nil?}
+          options = options.reject { |_key, value| value.nil? }
           data = service.create_server(name, image_ref, flavor_ref, options)
           merge_attributes(data.body['server'])
           true
@@ -387,23 +379,18 @@ module Fog
 
         def setup(credentials = {})
           requires :ssh_ip_address, :identity, :public_key, :username
-          Fog::SSH.new(ssh_ip_address, username, credentials).run([
-            %{mkdir .ssh},
-            %{echo "#{public_key}" >> ~/.ssh/authorized_keys},
-            %{passwd -l #{username}},
-            %{echo "#{Fog::JSON.encode(attributes)}" >> ~/attributes.json},
-            %{echo "#{Fog::JSON.encode(metadata)}" >> ~/metadata.json}
-          ])
+          ssh = Fog::SSH.new(ssh_ip_address, username, credentials)
+          ssh.run([
+                    %(mkdir .ssh),
+                    %(echo "#{public_key}" >> ~/.ssh/authorized_keys),
+                    %(passwd -l #{username}),
+                    %(echo "#{Fog::JSON.encode(attributes)}" >> ~/attributes.json),
+                    %(echo "#{Fog::JSON.encode(metadata)}" >> ~/metadata.json)
+                  ])
         rescue Errno::ECONNREFUSED
           sleep(1)
           retry
         end
-
-        private
-
-        def adminPass=(new_admin_pass)
-          @password = new_admin_pass
-        end
       end
     end
   end