staypuft 0.5.21 → 0.5.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 287dd565807a38aadb6bba10bf23c72ba6d547a9
-  data.tar.gz: f9ce3abdc84c8895ef3a4b2dfc09e8b4aac4afa1
+  metadata.gz: 461fa6ca3bcb1454074eb95f660908d517958457
+  data.tar.gz: f7c93284eac3dfd1f6b0aa6dc3c9574ff15018ee
 SHA512:
-  metadata.gz: 804e505829df4d611d5af1c6609c91289afa4c9ffd1ca8aa0e38ad90fc76de230b1fdb685be47598e831d410a457880a85d01514b3cce3174abd1d70cccda325
-  data.tar.gz: b53aeba82c3fed20b0526e6e88117f7b1b1f22832afb486bc8dc1e6e3d2c44c5f2b4ab05da28c7fb2fb13b875a4af0562cd223cd7b0adc210fa6102caf28a963
+  metadata.gz: 7a36c2831a1c2a33bc7dea56e94fb798b89a7ee1335655378bc301526116e5701aa2a0972a1dc560bcca5ef0fa3a0f9b20572ad7288743949f9b77a8053173e6
+  data.tar.gz: 5e0c8572c0f8786b74839d6d9d579359b3b6f8e08ab4ce34017b0c5b66fa32dbe0beb444d8188fff7feddea7a6c03336e347d0faea5d1fddb00b6a7b1e789235

data/app/lib/staypuft/seeder.rb

@@ -373,6 +373,7 @@ module Staypuft
       swift_user_pw                 = { :string => '<%= @host.deployment.passwords.effective_value(:swift_user) %>' }
       amqp_pw                       = { :string => '<%= @host.deployment.passwords.effective_value(:amqp) %>' }
       keystone_admin_token          = { :string => '<%= @host.deployment.passwords.effective_value(:keystone_admin_token) %>' }
+      hacluster_pw                  = { :string => '<%= @host.deployment.passwords.effective_value(:hacluster) %>' }
 
       #these don't share the user-supplied password value; they're always a random per param value
       ceilometer_metering           = { :string => '<%= @host.deployment.passwords.ceilometer_metering_secret %>' }
@@ -503,7 +504,8 @@ module Staypuft
               'fence_ipmilan_hostlist'        => fence_ipmilan_hostlist,
               'fence_ipmilan_host_to_address' => fence_ipmilan_host_to_address,
               'fence_ipmilan_expose_lanplus'  => fence_ipmilan_expose_lanplus,
-              'fence_ipmilan_lanplus_options' => fence_ipmilan_lanplus_options },
+              'fence_ipmilan_lanplus_options' => fence_ipmilan_lanplus_options,
+              'hacluster_pwd'                 => hacluster_pw },
           'quickstack::pacemaker::neutron'         => {
               'ml2_network_vlan_ranges'        => ml2_network_vlan_ranges,
               'ml2_tenant_network_types'       => ml2_tenant_network_types,
@@ -656,6 +658,7 @@ module Staypuft
               'ovs_tunnel_iface'           => compute_ovs_tunnel_iface,
               'ovs_tunnel_types'           => ovs_tunnel_types,
               'ovs_vlan_ranges'            => compute_ovs_vlan_ranges,
+              'ovs_l2_population'          => { :string =>  '<%= @host.deployment.neutron.l2population_mechanism? ? "True" : "False" %>' },
               'admin_password'             => admin_pw,
               'ceilometer_user_password'   => ceilometer_user_pw,
               'neutron_db_password'        => neutron_db_pw,

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

@@ -209,7 +209,7 @@ module Staypuft
     end
 
     def l3_ha
-      deployment.network_query.controllers.size > 1
+      (deployment.network_query.controllers.size > 1) && !l2population_mechanism?
     end
 
     def param_hash

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

@@ -5,7 +5,7 @@ module Staypuft
         :heat_cfn_user, :keystone_user, :neutron_user, :nova_user, :swift_user, :amqp
 
     DB_SERVICES_PASSWORDS = :cinder_db, :glance_db, :heat_db, :mysql_root, :keystone_db,
-        :neutron_db, :nova_db
+        :neutron_db, :nova_db, :hacluster
 
     OTHER_PASSWORDS = :keystone_admin_token, :ceilometer_metering_secret, :heat_auth_encrypt_key,
         :horizon_secret_key, :swift_shared_secret, :neutron_metadata_proxy_secret

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.5.21'
+  VERSION = '0.5.22'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.5.21
+  version: 0.5.22
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
@@ -317,14 +317,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: OpenStack Foreman Installer
 test_files:
 - test/test_helper.rb
-- test/unit/staypuft_test.rb
+- test/factories/staypuft_factories.rb
 - test/test_plugin_helper.rb
 - test/integration/navigation_test.rb
+- test/unit/staypuft_test.rb
 - test/staypuft_test.rb
-- test/factories/staypuft_factories.rb