ironfan 6.0.3 → 6.0.4

data/lib/ironfan/dsl/ec2.rb

@@ -53,7 +53,7 @@ module Ironfan
       end
 
       def ssh_key_name(computer)
-        keypair ? keypair.to_s : computer.server.cluster_name
+        keypair ? keypair.to_s : computer.server.keypair_name
       end
 
       def default_region

data/lib/ironfan/dsl/openstack.rb

@@ -53,7 +53,7 @@ module Ironfan
       end
 
       def ssh_key_name(computer)
-        keypair ? keypair.to_s : computer.server.cluster_name
+        keypair ? keypair.to_s : computer.server.keypair_name
       end
 
       def default_region

data/lib/ironfan/dsl/server.rb

@@ -232,8 +232,16 @@ module Ironfan
         super
       end
 
+      def keypair_name
+        full_cluster_name
+      end
+
+      def full_cluster_name
+          "#{realm_name}-#{cluster_name}"
+      end
+
       def full_name
-        "#{realm_name}-#{cluster_name}-#{facet_name}-#{name}"
+        "#{full_cluster_name}-#{facet_name}-#{name}"
       end
       def host_name()           full_name.gsub('_','-'); end;
       def fqdn()                [self.host_name, self.dns_domain].compact.join(".");     end

data/lib/ironfan/provider/ec2/keypair.rb

@@ -51,7 +51,7 @@ module Ironfan
 
         def self.prepare!(computers)
           return if computers.empty?
-          name = computers.values[0].server.cluster_name
+          name = computers.values[0].server.keypair_name
           return if recall? name
           Ironfan.step(name, "creating key pair for #{name}", :blue)
           result = Ec2.connection.create_key_pair(name)

data/lib/ironfan/provider/ec2/machine.rb

@@ -103,7 +103,7 @@ module Ironfan
         end
 
         def ssh_key
-          keypair = cloud.keypair || computer.server.cluster_name
+          keypair = cloud.keypair || computer.server.keypair_name
         end
 
         def to_s

data/lib/ironfan/provider/openstack/keypair.rb

@@ -51,7 +51,7 @@ module Ironfan
 
         def self.prepare!(computers)
           return if computers.empty?
-          name = computers.values[0].server.cluster_name
+          name = computers.values[0].server.keypair_name
           return if recall? name
           Ironfan.step(name, "creating key pair for #{name}", :blue)
           result = OpenStack.connection.create_key_pair(name)

data/lib/ironfan/provider/openstack/machine.rb

@@ -134,7 +134,7 @@ module Ironfan
         end
 
         def ssh_key
-          keypair = cloud.keypair || computer.server.cluster_name
+          keypair = cloud.keypair || computer.server.keypair_name
         end
 
         def private_ip_address

data/lib/ironfan/version.rb

@@ -1,3 +1,3 @@
 module Ironfan
-  VERSION = '6.0.3'
+  VERSION = '6.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -318,7 +318,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1692087169834386324
+      hash: -4288097787655203651
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -327,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1692087169834386324
+      hash: -4288097787655203651
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25