staypuft 0.5.6 → 0.5.7

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- ZjUyOTYwYjliZjgzY2EwMDBkMTQ2OGVjNzVjMDI5OGNlNzU4YTM1NQ==
4
+ ZTVjODQyMjE4OWI4OTE3ODgwZTY3YzMzMGU2MThkOWEwM2YxMDNjNw==
5
5
  data.tar.gz: !binary |-
6
- NmRlZDMyNDIzNjhjZjdkYmY2OTEwZTFlMGNlOTc0ZWM1MmM3YzI3Zg==
6
+ NThjZTViODc4ZmJjODY2Njc3ZTgyZGEyMzBlYTczYWFlNTcyMzgyMQ==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- YjI3ZTA5ZTEzNmFjMDUxNTdmNGVkNmNkYmVkODBmYzRjZmU2ODRkMzU1NThl
10
- ZmExNDliZGNjYTBjOTBhNTEwZTNmYjA2NzJjNTY2ODc3YWFhMWY5ZGYzODcw
11
- MDcyMzZhZmVlNWU1NWMxNTA3NGYwMzNiMjA5MmEzODViMDcxMWM=
9
+ NWNlMzI3Mjc4NzcwZTcxYjdmNTE4MDg4N2M1YWEzNjFlOWE3MjliYzY3ZTZi
10
+ Y2Q1Y2FiYWFiZmU5YTA3OTUzMjNiZDQyZGI1ZjcxZjYxNGM0YjAzZGE3NTEy
11
+ NzFkY2U0MDZjN2JjMzY5NzJjNTQ5MjdmNzM1OGY2M2U1NWVmNWM=
12
12
  data.tar.gz: !binary |-
13
- MDhmNmQxNGU4ZTA2ODlkYTIxZWIxYzVhNWQ2OWIwMzNlNGVkY2JmOTg0MWRm
14
- YzZiN2Q0NmMzYmZhZWJhNWFjMDFlNDU3NzY4MjIxZTZjMTZiM2U3N2Y0ODll
15
- MmMyMDY4NWNhMmU4OTFlMjcxNzQzNDJlZjI3N2I2ZjQwYmI0ZGY=
13
+ MGFjNDI2MmEwZWVkYjUyZTM3MDZjNDNkNjg5YzBlN2UwYzRhZDhiOTRhZDFl
14
+ ODAzZGRlMzNmZmQxMGU3NzU1Mzc2MDNkYjIyNzc0NjIyOGUzNGQwN2NkODg5
15
+ ZTAxZTljM2IxMjdhZjhiOTgxZWYyODFmZmRkMzQ2NTgyZWUwNjg=
@@ -264,7 +264,7 @@ module Staypuft
264
264
  'quota_security_group_rule' => 'default',
265
265
  'network_auto_schedule' => 'default' }
266
266
  }
267
- neutron_network_device_mtu = { :string => '<%= @host.deployment.neutron.network_device_mtu %>' }
267
+ neutron_network_device_mtu = { :string => '<%= @host.deployment.neutron.compute_network_device_mtu %>' }
268
268
 
269
269
  # Glance
270
270
  backend = { :string => '<%= @host.deployment.glance.backend %>' }
@@ -494,6 +494,7 @@ module Staypuft
494
494
  'n1kv_vsm_password' => n1kv_vsm_password,
495
495
  'security_group_api' => neutron_security_group_api,
496
496
  'network_device_mtu' => neutron_network_device_mtu,
497
+ 'veth_mtu' => neutron_network_device_mtu,
497
498
  },
498
499
  'quickstack::pacemaker::glance' => {
499
500
  'backend' => backend,
@@ -625,6 +626,7 @@ module Staypuft
625
626
  'agent_type' => neutron_agent_type,
626
627
  'security_group_api' => neutron_security_group_api,
627
628
  'network_device_mtu' => neutron_network_device_mtu,
629
+ 'veth_mtu' => neutron_network_device_mtu,
628
630
  },
629
631
  'quickstack::pacemaker::rsync::keystone' => {
630
632
  'keystone_private_vip' => vip_format(:keystone) },
@@ -92,6 +92,12 @@ module Staypuft
92
92
 
93
93
  validates :network_device_mtu, numericality: { only_integer: true }, allow_blank: true
94
94
 
95
+ def compute_network_device_mtu
96
+ # Note: This should only be used for setting the puppet params, not for the
97
+ # physical interfaces
98
+ this.enable_tunneling? ? this.network_device_mtu - 50 : this.network_device_mtu
99
+ end
100
+
95
101
  class Jail < Safemode::Jail
96
102
  allow :networker_vlan_ranges, :compute_vlan_ranges, :network_segmentation, :enable_tunneling?,
97
103
  :tenant_iface, :networker_ovs_bridge_mappings, :networker_ovs_bridge_uplinks,
@@ -99,7 +105,7 @@ module Staypuft
99
105
  :openvswitch_mechanism?, :l2population_mechanism?, :cisco_nexus_mechanism?,
100
106
  :ml2_mechanisms, :nexuses, :active?, :compute_cisco_nexus_config, :core_plugin,
101
107
  :ml2_plugin?, :n1kv_plugin?, :n1kv_vsm_ip, :n1kv_vsm_password,
102
- :core_plugin_module, :network_device_mtu
108
+ :core_plugin_module, :network_device_mtu, :compute_network_device_mtu
103
109
  end
104
110
 
105
111
  def set_defaults
@@ -1,3 +1,3 @@
1
1
  module Staypuft
2
- VERSION = '0.5.6'
2
+ VERSION = '0.5.7'
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.6
4
+ version: 0.5.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Staypuft team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-12-16 00:00:00.000000000 Z
11
+ date: 2014-12-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: foreman-tasks