staypuft 0.5.5 → 0.5.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDcwZDhkOTZjODlhNzg5N2NmZTQ1ZTY0N2VjNzNkMWQ1YzZmNWExMQ==
+    ZjUyOTYwYjliZjgzY2EwMDBkMTQ2OGVjNzVjMDI5OGNlNzU4YTM1NQ==
   data.tar.gz: !binary |-
-    ZDI0Y2YxOWY1ZjA2OGNhNTQ0MGZkYWJkNWMzNzU4NGFlZWI3NzA5Nw==
+    NmRlZDMyNDIzNjhjZjdkYmY2OTEwZTFlMGNlOTc0ZWM1MmM3YzI3Zg==
 SHA512:
   metadata.gz: !binary |-
-    M2NhYmRkNjQzZGVlYmQwMDUyZDljMjc4Y2I2MjRlNjhlNWViMDU0OThiMGMx
-    YjM4ZTc1ZjE5MWZiMzQzMmNjOTQ1ZGVlNjc2NWJhMmJkYmU2MTcxZDMzOGQ5
-    OTgwZjdhNzQ2NmE4NWYwMzAyZDQ3MjU2YWQ1MjMwNDUyNmEwNzU=
+    YjI3ZTA5ZTEzNmFjMDUxNTdmNGVkNmNkYmVkODBmYzRjZmU2ODRkMzU1NThl
+    ZmExNDliZGNjYTBjOTBhNTEwZTNmYjA2NzJjNTY2ODc3YWFhMWY5ZGYzODcw
+    MDcyMzZhZmVlNWU1NWMxNTA3NGYwMzNiMjA5MmEzODViMDcxMWM=
   data.tar.gz: !binary |-
-    NDU4MDlkZTcwODEzY2JjNGJkYTlhMDBlYmI2Y2Y1OGQ5NDRiMDUwZmI5MDQ1
-    YTYyZmU5M2RiZWI2NGVjZWEyMjc3Mjg5NDk0NzA3NzliZjhiYmUwZWViMjJl
-    NDFkNTQ4ODMyMzgwMmIxY2I2ZWQyMTIyMDA4OTc1ZWNlMThmNDc=
+    MDhmNmQxNGU4ZTA2ODlkYTIxZWIxYzVhNWQ2OWIwMzNlNGVkY2JmOTg0MWRm
+    YzZiN2Q0NmMzYmZhZWJhNWFjMDFlNDU3NzY4MjIxZTZjMTZiM2U3N2Y0ODll
+    MmMyMDY4NWNhMmU4OTFlMjcxNzQzNDJlZjI3N2I2ZjQwYmI0ZGY=

data/app/lib/staypuft/network_query.rb

@@ -95,6 +95,12 @@ module Staypuft
       controllers.map &:shortname
     end
 
+    def controller_lb_backend_shortnames
+      controllers.map do |controller|
+        "lb-backend-"+controller.shortname
+      end
+    end
+
     def controller_pcmk_shortnames
       controllers.map do |controller|
         "pcmk-"+controller.shortname
@@ -112,7 +118,7 @@ module Staypuft
       allow :ip_for_host, :interface_for_host, :network_address_for_host,
             :controller_ip, :controller_ips, :controller_fqdns, :get_vip, :controller_pcmk_shortnames,
             :subnet_for_host, :gateway_subnet, :gateway_interface, :gateway_interface_mac,
-            :tenant_subnet?, :mtu_for_tenant_subnet
+            :tenant_subnet?, :mtu_for_tenant_subnet, :controller_lb_backend_shortnames
     end
 
     private

data/app/lib/staypuft/seeder.rb

@@ -355,7 +355,8 @@ module Staypuft
       neutron_metadata_proxy_secret = { :string => '<%= @host.deployment.passwords.neutron_metadata_proxy_secret %>' }
 
 
-      private_ip   = { :string => "<%= @host.deployment.network_query.ip_for_host('#{Staypuft::SubnetType::MANAGEMENT}', @host) %>" }
+      private_ip   = { :string => "<%= @host.network_query.ip_for_host('#{Staypuft::SubnetType::MANAGEMENT}') %>" }
+      pcmk_ip      = { :string => "<%= @host.network_query.ip_for_host('#{Staypuft::SubnetType::CLUSTER_MGMT}') %>" }
       # private API/management
       amqp_host    = get_host_format :amqp_vip, Staypuft::SubnetType::MANAGEMENT
       mysql_host   = get_host_format :db_vip, Staypuft::SubnetType::MANAGEMENT
@@ -455,9 +456,12 @@ module Staypuft
               'amqp_vip'                      => vip_format(:amqp_vip),
               'swift_public_vip'              => vip_format(:swift_public_vip),
               'private_ip'                    => private_ip,
+              'pcmk_ip'                       => pcmk_ip,
               'cluster_control_ip'            => { :string => "<%= @host.deployment.network_query.controller_ips('#{Staypuft::SubnetType::MANAGEMENT}').first %>" },
-              'lb_backend_server_addrs'       => { :array => "<%= @host.deployment.network_query.controller_ips('#{Staypuft::SubnetType::CLUSTER_MGMT}') %>" },
-              'lb_backend_server_names'       => { :array => '<%= @host.deployment.network_query.controller_pcmk_shortnames %>' },
+              'lb_backend_server_addrs'       => { :array => "<%= @host.deployment.network_query.controller_ips('#{Staypuft::SubnetType::MANAGEMENT}') %>" },
+              'lb_backend_server_names'       => { :array => '<%= @host.deployment.network_query.controller_lb_backend_shortnames %>' },
+              'pcmk_server_addrs'             => { :array => "<%= @host.deployment.network_query.controller_ips('#{Staypuft::SubnetType::CLUSTER_MGMT}') %>" },
+              'pcmk_server_names'             => { :array => '<%= @host.deployment.network_query.controller_pcmk_shortnames %>' },
               'agent_type'                    => neutron_agent_type,
               'n1kv_plugin_additional_params' => n1kv_plugin_additional_params },
           'quickstack::pacemaker::common'          => {

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.5.5'
+  VERSION = '0.5.6'
 end

metadata

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