staypuft 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4c1705398e46ec5568abc0ab8335dff279719c9
-  data.tar.gz: 3f47eaa170912b118662a4408cc64dc8c284812b
+  metadata.gz: 45b52d5a9c0aa95ff9d31fbef3c20b491d000a1b
+  data.tar.gz: b901b85c5ab666ed79303e20ef127f76cf928607
 SHA512:
-  metadata.gz: 0aec5dc5dd3bebcf6b3b71baf37c76698afd99b67b3c3f951532ff98149c54b4858c19a4da61b6de1cf37bc69a004583ba2afba782e78727cd606fdbc24b5253
-  data.tar.gz: faab17c4c5d7271394c7140f2d92538e4c83c2b073e7cf1827c71072ad92822f0ce81262ee642d14b8ac7ca83ac67359dc74679a8a0a602e53c7cf3d582110ec
+  metadata.gz: f63308f66381fc965dfe19a7718925494295d4e7f7a76ee1fbb4123f1cd12d1a993ce4854151cfa9c5004525e9c59ce8aae9eaaa3a4e4bb78680c6eba758f5ee
+  data.tar.gz: 6eb41ec18540190e04906eb24c94c684b0273f53174b26244ee9ca40361cb2e36761eee3946a168d2ece55bb69d2eb97dc3023429739bb8944bbe8161e298d2f

data/app/lib/staypuft/seeder.rb

@@ -172,8 +172,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.nova.compute_tenant_interface %>' }
-      network_public_iface        = { :string => '<%= @host.deployment.nova.external_interface_name %>' }
+      network_private_iface       = { :string => '<%= @host.deployment.nova.private_iface %>' }
+      network_public_iface        = { :string => '<%= @host.deployment.nova.public_iface %>' }
       network_create_networks     = true
 
       # Neutron
@@ -185,10 +185,10 @@ module Staypuft
       ml2_tunnel_id_ranges        = ['10:1000']
       ml2_vni_ranges              = ['10:1000']
       ovs_tunnel_types            = ['vxlan', 'gre']
-      ovs_tunnel_iface            = { :string => '<%= n = @host.deployment.neutron; n.enable_tunneling? ? n.networker_tenant_interface : "" %>' }
+      ovs_tunnel_iface            = { :string => '<%= n = @host.deployment.neutron; n.enable_tunneling? ? n.networker_tenant_iface : "" %>' }
       ovs_bridge_mappings         = { :array =>  '<%= @host.deployment.neutron.networker_ovs_bridge_mappings %>' }
       ovs_bridge_uplinks          = { :array =>  '<%= @host.deployment.neutron.networker_ovs_bridge_uplinks %>' }
-      compute_ovs_tunnel_iface    = { :string => '<%= n = @host.deployment.neutron; n.enable_tunneling? ? n.compute_tenant_interface : "" %>' }
+      compute_ovs_tunnel_iface    = { :string => '<%= n = @host.deployment.neutron; n.enable_tunneling? ? n.compute_tenant_iface : "" %>' }
       compute_ovs_bridge_mappings = { :array =>  '<%= @host.deployment.neutron.compute_ovs_bridge_mappings %>' }
       compute_ovs_bridge_uplinks  = { :array =>  '<%= @host.deployment.neutron.compute_ovs_bridge_uplinks %>' }
       enable_tunneling            = { :string => '<%= @host.deployment.neutron.enable_tunneling?.to_s %>' }
@@ -239,6 +239,8 @@ module Staypuft
       cinder_eqlx_chap_login        = ['']
       cinder_eqlx_chap_password     = ['']
 
+      # Keystone
+      keystonerc = 'true'
 
       # effective_value grabs shared password if deployment is in shared password mode,
       # otherwise use the service-specific one
@@ -315,6 +317,7 @@ module Staypuft
               'glance_backend'                          => backend,
               'glance_rbd_store_user'                   => glance_rbd_store_user,
               'glance_rbd_store_pool'                   => glance_rbd_store_pool,
+              'keystonerc'                              => keystonerc,
               'admin_password'                          => admin_pw,
               'ceilometer_user_password'                => ceilometer_user_pw,
               'cinder_db_password'                      => cinder_db_pw,
@@ -384,6 +387,7 @@ module Staypuft
               'glance_backend'                          => backend,
               'glance_rbd_store_user'                   => glance_rbd_store_user,
               'glance_rbd_store_pool'                   => glance_rbd_store_pool,
+              'keystonerc'                              => keystonerc,
               'admin_password'                          => admin_pw,
               'ceilometer_user_password'                => ceilometer_user_pw,
               'cinder_db_password'                      => cinder_db_pw,
@@ -518,6 +522,7 @@ module Staypuft
               'eqlx_chap_login'                  => cinder_eqlx_chap_login,
               'eqlx_chap_password'               => cinder_eqlx_chap_password },
           'quickstack::pacemaker::keystone'        => {
+              'keystonerc'     => keystonerc,
               'admin_password' => admin_pw,
               'admin_token'    => keystone_admin_token },
           'quickstack::pacemaker::horizon'         => {

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

@@ -1,3 +1,5 @@
+require 'resolv'
+
 module Staypuft
   class Deployment::IPS < Deployment::AbstractParamScope
 
@@ -10,7 +12,9 @@ module Staypuft
     end
 
     def controller_ips
-      controllers.map &:ip
+      controllers.map do |controller|
+        ip_for_controller(controller)
+      end
     end
 
     def controller_fqdns
@@ -18,8 +22,15 @@ module Staypuft
     end
 
     def controller_ip
-      controllers.tap { |v| v.size == 1 or raise }.first.ip
+      ip_for_controller(controllers.tap { |v| v.size == 1 or raise }.first)
     end
 
+    # TODO: a better fix is needed once we have explicit subnet support in staypuft
+    # This is needed because host.ip doesn't always return the expected ip address
+    # when the host has more than one network interface -- this ensures that the
+    # provisioning network interface is the chosen one.
+    def ip_for_controller(controller)
+      Resolv::DNS.new(:nameserver => 'localhost').getaddress(controller.fqdn).to_s
+    end
   end
 end

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

@@ -77,8 +77,8 @@ module Staypuft
 
     class Jail < Safemode::Jail
       allow :networker_vlan_ranges, :compute_vlan_ranges, :network_segmentation, :enable_tunneling?,
-        :networker_tenant_interface, :networker_ovs_bridge_mappings, :networker_ovs_bridge_uplinks,
-        :compute_tenant_interface, :compute_ovs_bridge_mappings, :compute_ovs_bridge_uplinks
+        :networker_tenant_iface, :networker_ovs_bridge_mappings, :networker_ovs_bridge_uplinks,
+        :compute_tenant_iface, :compute_ovs_bridge_mappings, :compute_ovs_bridge_uplinks
     end
 
     def set_defaults
@@ -102,19 +102,19 @@ module Staypuft
     end
 
     def networker_ovs_bridge_mappings
-      [("physnet-tenants:br-#{self.networker_tenant_interface}"  unless self.enable_tunneling?),
+      [("physnet-tenants:br-#{self.networker_tenant_iface}"  unless self.enable_tunneling?),
        ('physnet-external:br-ex' if self.use_external_interface?)].compact
     end
 
     def networker_ovs_bridge_uplinks
-      [("br-#{self.networker_tenant_interface}:#{self.networker_tenant_interface}" unless self.enable_tunneling?),
-       ("br-ex:#{self.external_interface_name}" if self.use_external_interface?)
+      [("br-#{self.networker_tenant_iface}:#{self.networker_tenant_iface}" unless self.enable_tunneling?),
+       ("br-ex:#{self.external_interface_name.downcase}" if self.use_external_interface?)
       ].compact
     end
 
     def compute_ovs_bridge_mappings
       if !self.enable_tunneling?
-        ["physnet-tenants:br-#{self.compute_tenant_interface}"]
+        ["physnet-tenants:br-#{self.compute_tenant_iface}"]
       else
         []
       end
@@ -122,7 +122,7 @@ module Staypuft
 
     def compute_ovs_bridge_uplinks
       if !self.enable_tunneling?
-        ["br-#{self.compute_tenant_interface}:#{self.compute_tenant_interface}"]
+        ["br-#{self.compute_tenant_iface}:#{self.compute_tenant_iface}"]
       else
         []
       end
@@ -149,6 +149,14 @@ module Staypuft
       [NetworkSegmentation::VXLAN, NetworkSegmentation::GRE].include?(network_segmentation)
     end
 
+    def networker_tenant_iface
+      networker_tenant_interface.downcase unless networker_tenant_interface.nil?
+    end
+
+    def compute_tenant_iface
+      compute_tenant_interface.downcase unless compute_tenant_interface.nil?
+    end
+
     def param_hash
       { 'network_segmentation'       => network_segmentation,
         'tenant_vlan_ranges'         => tenant_vlan_ranges,

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

@@ -87,7 +87,6 @@ module Staypuft
     end
 
     validates :public_floating_range, presence: true
-    # TODO: interface format validation
 
     module ComputeTenantInterface
       HUMAN       = N_('Which interface to use for tenant networks')
@@ -99,12 +98,11 @@ module Staypuft
     # TODO: interface name format validation
 
     module PrivateFixedRange
-      HUMAN       = N_('Private IP range for tenant networks')
+      HUMAN       = N_('Fixed IP range for tenant networks')
       HUMAN_AFTER = PublicFloatingRange::HUMAN_AFTER
     end
 
     validates :private_fixed_range, presence: true
-    # TODO: interface format validation
 
     def set_defaults
       self.network_manager = NetworkManager::FLAT_DHCP
@@ -140,6 +138,14 @@ module Staypuft
       end
     end
 
+    def private_iface
+      compute_tenant_interface.downcase unless compute_tenant_interface.nil?
+    end
+
+    def public_iface
+      external_interface_name.downcase unless external_interface_name.nil?
+    end
+
     def param_hash
       { 'network_manager'          => network_manager,
         'vlan_range'               => vlan_range,
@@ -151,7 +157,7 @@ module Staypuft
 
     class Jail < Safemode::Jail
       allow :network_manager, :network_overrides, :private_fixed_range, :public_floating_range,
-        :compute_tenant_interface, :external_interface_name, :num_networks
+        :private_iface, :public_iface, :num_networks
     end
 
   end

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks