staypuft 0.5.21 → 0.5.22

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 287dd565807a38aadb6bba10bf23c72ba6d547a9
4
- data.tar.gz: f9ce3abdc84c8895ef3a4b2dfc09e8b4aac4afa1
3
+ metadata.gz: 461fa6ca3bcb1454074eb95f660908d517958457
4
+ data.tar.gz: f7c93284eac3dfd1f6b0aa6dc3c9574ff15018ee
5
5
  SHA512:
6
- metadata.gz: 804e505829df4d611d5af1c6609c91289afa4c9ffd1ca8aa0e38ad90fc76de230b1fdb685be47598e831d410a457880a85d01514b3cce3174abd1d70cccda325
7
- data.tar.gz: b53aeba82c3fed20b0526e6e88117f7b1b1f22832afb486bc8dc1e6e3d2c44c5f2b4ab05da28c7fb2fb13b875a4af0562cd223cd7b0adc210fa6102caf28a963
6
+ metadata.gz: 7a36c2831a1c2a33bc7dea56e94fb798b89a7ee1335655378bc301526116e5701aa2a0972a1dc560bcca5ef0fa3a0f9b20572ad7288743949f9b77a8053173e6
7
+ data.tar.gz: 5e0c8572c0f8786b74839d6d9d579359b3b6f8e08ab4ce34017b0c5b66fa32dbe0beb444d8188fff7feddea7a6c03336e347d0faea5d1fddb00b6a7b1e789235
@@ -373,6 +373,7 @@ module Staypuft
373
373
  swift_user_pw = { :string => '<%= @host.deployment.passwords.effective_value(:swift_user) %>' }
374
374
  amqp_pw = { :string => '<%= @host.deployment.passwords.effective_value(:amqp) %>' }
375
375
  keystone_admin_token = { :string => '<%= @host.deployment.passwords.effective_value(:keystone_admin_token) %>' }
376
+ hacluster_pw = { :string => '<%= @host.deployment.passwords.effective_value(:hacluster) %>' }
376
377
 
377
378
  #these don't share the user-supplied password value; they're always a random per param value
378
379
  ceilometer_metering = { :string => '<%= @host.deployment.passwords.ceilometer_metering_secret %>' }
@@ -503,7 +504,8 @@ module Staypuft
503
504
  'fence_ipmilan_hostlist' => fence_ipmilan_hostlist,
504
505
  'fence_ipmilan_host_to_address' => fence_ipmilan_host_to_address,
505
506
  'fence_ipmilan_expose_lanplus' => fence_ipmilan_expose_lanplus,
506
- 'fence_ipmilan_lanplus_options' => fence_ipmilan_lanplus_options },
507
+ 'fence_ipmilan_lanplus_options' => fence_ipmilan_lanplus_options,
508
+ 'hacluster_pwd' => hacluster_pw },
507
509
  'quickstack::pacemaker::neutron' => {
508
510
  'ml2_network_vlan_ranges' => ml2_network_vlan_ranges,
509
511
  'ml2_tenant_network_types' => ml2_tenant_network_types,
@@ -656,6 +658,7 @@ module Staypuft
656
658
  'ovs_tunnel_iface' => compute_ovs_tunnel_iface,
657
659
  'ovs_tunnel_types' => ovs_tunnel_types,
658
660
  'ovs_vlan_ranges' => compute_ovs_vlan_ranges,
661
+ 'ovs_l2_population' => { :string => '<%= @host.deployment.neutron.l2population_mechanism? ? "True" : "False" %>' },
659
662
  'admin_password' => admin_pw,
660
663
  'ceilometer_user_password' => ceilometer_user_pw,
661
664
  'neutron_db_password' => neutron_db_pw,
@@ -209,7 +209,7 @@ module Staypuft
209
209
  end
210
210
 
211
211
  def l3_ha
212
- deployment.network_query.controllers.size > 1
212
+ (deployment.network_query.controllers.size > 1) && !l2population_mechanism?
213
213
  end
214
214
 
215
215
  def param_hash
@@ -5,7 +5,7 @@ module Staypuft
5
5
  :heat_cfn_user, :keystone_user, :neutron_user, :nova_user, :swift_user, :amqp
6
6
 
7
7
  DB_SERVICES_PASSWORDS = :cinder_db, :glance_db, :heat_db, :mysql_root, :keystone_db,
8
- :neutron_db, :nova_db
8
+ :neutron_db, :nova_db, :hacluster
9
9
 
10
10
  OTHER_PASSWORDS = :keystone_admin_token, :ceilometer_metering_secret, :heat_auth_encrypt_key,
11
11
  :horizon_secret_key, :swift_shared_secret, :neutron_metadata_proxy_secret
@@ -1,3 +1,3 @@
1
1
  module Staypuft
2
- VERSION = '0.5.21'
2
+ VERSION = '0.5.22'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: staypuft
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.21
4
+ version: 0.5.22
5
5
  platform: ruby
6
6
  authors:
7
7
  - Staypuft team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-13 00:00:00.000000000 Z
11
+ date: 2015-03-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: foreman-tasks
@@ -317,14 +317,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
317
317
  version: '0'
318
318
  requirements: []
319
319
  rubyforge_project:
320
- rubygems_version: 2.2.2
320
+ rubygems_version: 2.4.6
321
321
  signing_key:
322
322
  specification_version: 4
323
323
  summary: OpenStack Foreman Installer
324
324
  test_files:
325
325
  - test/test_helper.rb
326
- - test/unit/staypuft_test.rb
326
+ - test/factories/staypuft_factories.rb
327
327
  - test/test_plugin_helper.rb
328
328
  - test/integration/navigation_test.rb
329
+ - test/unit/staypuft_test.rb
329
330
  - test/staypuft_test.rb
330
- - test/factories/staypuft_factories.rb