staypuft 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7622052ac4880d6725eb045121b15069d508329
-  data.tar.gz: 10373f5df0ea8ba8c582766c921699e455229cfc
+  metadata.gz: ecedbdd2ea81a9ce7287d7cdbe5382f8ce86e5a3
+  data.tar.gz: cb2332dab9ceda616c083f1a2196f13c3a7cf10f
 SHA512:
-  metadata.gz: 083822b65880648551e760e55393ba38d70b8de42be1cc751293a8113ab71d3ef1a929590fb9ae0dd3d3131dc933e617d501ae048344d28f4ba8f7d0805885ca
-  data.tar.gz: b2a914e38b530af822b17604462bc16293ee6107aecbfabb5260cf6a4e97d1f0fa41d2db1e2ecf0bf2ecbac55360e181d2a1fa2d6849178bfc680d8680931961
+  metadata.gz: 9418075d837ba35a8be9a79a02e9aa5e5e64a4ed0b8f8c89c7ded7e47f4a61dca4a5c0ced030e14c75fa1cb63758de6ea114f97c86e661647cdc881ca42e933e
+  data.tar.gz: f5d1961cfb88f300bd0c932112125a755a7b769f3a0e7911ad0e648b0c5c692bc1cff71a7b80b6bc937df3a0de732481b86dcc51f37b26dfb17463cb754c2c32

data/app/lib/staypuft/network_query.rb

@@ -37,33 +37,46 @@ module Staypuft
     }
     COUNT     = VIP_NAMES.size
 
-    def initialize(deployment)
+    def initialize(deployment, host=nil)
       @deployment = deployment
+      @host       = host
     end
 
-    def ip_for_host(host, subnet_type_name)
-      interface_hash_for_host(host, subnet_type_name)[:ip]
+    def ip_for_host(subnet_type_name, host=@host)
+      interface_hash_for_host(subnet_type_name, host)[:ip]
     end
 
-    def interface_for_host(host, subnet_type_name)
-      interface_hash_for_host(host, subnet_type_name)[:interface]
+    def interface_for_host(subnet_type_name, host=@host)
+      interface_hash_for_host(subnet_type_name, host)[:interface]
     end
 
-    def network_address_for_host(host, subnet_type_name)
-      subnet = interface_hash_for_host(host, subnet_type_name)[:subnet]
+    def network_address_for_host(subnet_type_name, host=@host)
+      subnet = subnet_for_host(subnet_type_name, host)
       subnet.network_address if subnet
     end
 
+    def subnet_for_host(subnet_type_name, host=@host)
+      interface_hash_for_host(subnet_type_name, host)[:subnet]
+    end
+
+    def gateway_subnet(host=@host)
+      gateway_hash_for_host(host)[:subnet]
+    end
+
+    def gateway_interface(host=@host)
+      gateway_hash_for_host(host)[:interface]
+    end
+
     def controllers
       @controllers ||= @deployment.controller_hostgroup.hosts.order(:id)
     end
 
     def controller_ips(subnet_type_name)
-      controllers.map { |controller| ip_for_host(controller, subnet_type_name) }
+      controllers.map { |controller| ip_for_host(subnet_type_name, controller) }
     end
 
     def controller_ip(subnet_type_name)
-      ip_for_host(controllers.tap { |v| v.size == 1 or raise('only one controller is allowed') }.first, subnet_type_name)
+      ip_for_host(subnet_type_name, controllers.tap { |v| v.size == 1 or raise('only one controller is allowed') }.first)
     end
 
     def controller_fqdns
@@ -87,11 +100,12 @@ module Staypuft
 
     class Jail < Safemode::Jail
       allow :ip_for_host, :interface_for_host, :network_address_for_host,
-            :controller_ip, :controller_ips, :controller_fqdns, :get_vip
+            :controller_ip, :controller_ips, :controller_fqdns, :get_vip,
+            :subnet_for_host, :gateway_subnet, :gateway_interface
     end
 
     private
-    def interface_hash_for_host(host, subnet_type_name)
+    def interface_hash_for_host(subnet_type_name, host)
       if host.nil?
         raise ArgumentError, "no host specified"
       end
@@ -120,5 +134,11 @@ module Staypuft
         {}
       end
     end
+
+    def gateway_hash_for_host(host)
+      gateway_hash = interface_hash_for_host(Staypuft::SubnetType::PUBLIC_API, host)
+      gateway_hash = interface_hash_for_host(Staypuft::SubnetType::PXE, host) unless gateway_hash[:subnet]
+      gateway_hash
+    end
   end
 end

data/app/lib/staypuft/seeder.rb

@@ -209,7 +209,7 @@ module Staypuft
 
     # virtual ip addresses
     def vip_format(param_name)
-      { :string => '<%%= @host.deployment.network_query.get_vip(:%s) %%>' % param_name }
+      { :string => '<%%= @host.network_query.get_vip(:%s) %%>' % param_name }
     end
 
     def functional_dependencies
@@ -224,8 +224,8 @@ module Staypuft
       network_num_networks        = { :string => '<%= @host.deployment.nova.num_networks %>' }
       network_fixed_range         = { :string => '<%= @host.deployment.nova.private_fixed_range %>' }
       network_floating_range      = { :string => '<%= @host.deployment.nova.public_floating_range %>' }
-      network_private_iface       = { :string => "<%= @host.deployment.network_query.interface_for_host(@host, '#{Staypuft::SubnetType::TENANT}') %>" }
-      network_public_iface        = { :string => "<%= @host.deployment.network_query.interface_for_host(@host, '#{Staypuft::SubnetType::EXTERNAL}') %>" }
+      network_private_iface       = { :string => "<%= @host.network_query.interface_for_host('#{Staypuft::SubnetType::TENANT}') %>" }
+      network_public_iface        = { :string => "<%= @host.network_query.interface_for_host('#{Staypuft::SubnetType::EXTERNAL}') %>" }
       network_create_networks     = true
 
       # Neutron
@@ -295,15 +295,15 @@ module Staypuft
       keystonerc = 'true'
 
       # Ceph
-      ceph_cluster_network      = { :string => "<%= @host.deployment.network_query.network_address_for_host(@host, '#{Staypuft::SubnetType::STORAGE_CLUSTERING}') %>" }
+      ceph_cluster_network      = { :string => "<%= @host.network_query.network_address_for_host('#{Staypuft::SubnetType::STORAGE_CLUSTERING}') %>" }
       # FIXME: this should actually be STORAGE instead of PXE, but only after we have a reliable way of identifying DNS names
       #        on the storage network
-      ceph_public_network      = { :string => "<%= @host.deployment.network_query.network_address_for_host(@host, '#{Staypuft::SubnetType::PXE}') %>" }
+      ceph_public_network      = { :string => "<%= @host.network_query.network_address_for_host('#{Staypuft::SubnetType::PXE}') %>" }
       ceph_fsid                = { :string => '<%= @host.deployment.ceph.fsid %>' }
       ceph_images_key          = { :string => '<%= @host.deployment.ceph.images_key %>' }
       ceph_volumes_key         = { :string => '<%= @host.deployment.ceph.volumes_key %>' }
       # FIXME: this should move to STORAGE from PXE like above
-      ceph_mon_host            = { :array => "<%= @host.deployment.network_query.controller_ips('#{Staypuft::SubnetType::PXE}') %>" }
+      ceph_mon_host            = { :array => "<%= @host.network_query.controller_ips('#{Staypuft::SubnetType::PXE}') %>" }
       # FIXME: This is currently the hostnames (which maps to fqdns on the PXE network) -- eventually we want DNS names
       #        on the Storage network
       ceph_mon_initial_members = { :array => "<%= @host.deployment.ceph.mon_initial_members %>" }
@@ -340,7 +340,7 @@ module Staypuft
       neutron_metadata_proxy_secret = { :string => '<%= @host.deployment.passwords.neutron_metadata_proxy_secret %>' }
 
 
-      private_ip   = { :string => "<%= @host.deployment.network_query.ip_for_host(@host, '#{Staypuft::SubnetType::MANAGEMENT}') %>" }
+      private_ip   = { :string => "<%= @host.deployment.network_query.ip_for_host('#{Staypuft::SubnetType::MANAGEMENT}', @host) %>" }
       # private API/management
       amqp_host    = get_host_format :amqp_vip, Staypuft::SubnetType::MANAGEMENT
       mysql_host   = get_host_format :db_vip, Staypuft::SubnetType::MANAGEMENT
@@ -355,7 +355,7 @@ module Staypuft
       controller_priv_host  = { :string => "<%= d = @host.deployment; d.ha? ? nil : d.network_query.controller_ip('#{Staypuft::SubnetType::MANAGEMENT}') %>"}
       controller_pub_host   = { :string => "<%= d = @host.deployment; d.ha? ? nil : d.network_query.controller_ip('#{Staypuft::SubnetType::PUBLIC_API}') %>"}
 
-      fencing_type                   = { :string => '<%= @host.bmc_nic.attrs["fencing_type"] if @host.bmc_nic && @host.bmc_nic.fencing_enabled? %>' }
+      fencing_type                   = { :string => '<%= (@host.bmc_nic && @host.bmc_nic.fencing_enabled?) ? @host.bmc_nic.attrs["fencing_type"] : "disabled" %>' }
       fence_ipmilan_address          = { :string => '<%= @host.bmc_nic.ip if @host.bmc_nic && @host.bmc_nic.fencing_enabled? %>' }
       fence_ipmilan_username         = { :string => '<%= @host.bmc_nic.username if @host.bmc_nic && @host.bmc_nic.fencing_enabled? %>' }
       fence_ipmilan_password         = { :string => '<%= @host.bmc_nic.password if @host.bmc_nic && @host.bmc_nic.fencing_enabled? %>' }

data/app/models/staypuft/concerns/host_interface_management.rb

@@ -46,6 +46,15 @@ module Staypuft
           n += 1
         end
       end
+
+      def network_query
+        @network_query || NetworkQuery.new(self.hostgroup.deployment, self)
+      end
+        
     end
   end
 end
+
+class ::Host::Managed::Jail < Safemode::Jail
+  allow :network_query
+end

data/app/models/staypuft/deployment/neutron_service.rb

@@ -91,11 +91,11 @@ module Staypuft
     end
 
     def tenant_iface(host)
-      deployment.network_query.interface_for_host(host, Staypuft::SubnetType::TENANT)
+      deployment.network_query.interface_for_host(Staypuft::SubnetType::TENANT, host)
     end
 
     def external_interface_name(host)
-      deployment.network_query.interface_for_host(host, Staypuft::SubnetType::EXTERNAL)
+      deployment.network_query.interface_for_host(Staypuft::SubnetType::EXTERNAL, host)
     end
 
     def ovs_tunnel_types

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks