loadbalancer: update hiera parameters for HAproxy/keepalived split

In puppet-tripleo, we split loadbalancer.pp in 2 classes to be more
composable: haproxy & keepalived.
This patch is just updating all hiera parameters related to HAproxy &
keepalived.

Depends-On: I46ed8348dc990d9aa0d896e1abea3b30a8292634

Change-Id: Ibf56184cd10af1d0dcae773c02b0f31a6204badf

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 703ff26..ca38c80 100644 (file)
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -1501,13 +1501,15 @@ resources:
                 timezone::timezone: {get_input: timezone}
                 control_virtual_interface: {get_input: control_virtual_interface}
                 public_virtual_interface: {get_input: public_virtual_interface}
-                tripleo::loadbalancer::control_virtual_interface: {get_input: control_virtual_interface}
-                tripleo::loadbalancer::public_virtual_interface: {get_input: public_virtual_interface}
-                tripleo::loadbalancer::haproxy_log_address: {get_input: haproxy_log_address}
-                tripleo::loadbalancer::service_certificate: {get_attr: [NodeTLSData, deployed_ssl_certificate_path]}
-                tripleo::loadbalancer::haproxy_stats_user: {get_input: haproxy_stats_user}
-                tripleo::loadbalancer::haproxy_stats_password: {get_input: haproxy_stats_password}
-                tripleo::loadbalancer::redis_password: {get_input: redis_password}
+                tripleo::keepalived::control_virtual_interface: {get_input: control_virtual_interface}
+                tripleo::keepalived::public_virtual_interface: {get_input: public_virtual_interface}
+                tripleo::haproxy::control_virtual_interface: {get_input: control_virtual_interface}
+                tripleo::haproxy::public_virtual_interface: {get_input: public_virtual_interface}
+                tripleo::haproxy::haproxy_log_address: {get_input: haproxy_log_address}
+                tripleo::haproxy::service_certificate: {get_attr: [NodeTLSData, deployed_ssl_certificate_path]}
+                tripleo::haproxy::haproxy_stats_user: {get_input: haproxy_stats_user}
+                tripleo::haproxy::haproxy_stats_password: {get_input: haproxy_stats_password}
+                tripleo::haproxy::redis_password: {get_input: redis_password}
                 tripleo::packages::enable_install: {get_input: enable_package_install}
                 tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
 

diff --git a/puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml b/puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml
index 26ce713..3e45534 100644 (file)
--- a/puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml
+++ b/puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml
@@ -85,7 +85,7 @@ resources:
                 tripleo::cluster::cassandra::ssl_storage_port: {get_param: CassandraSslStoragePort}
                 tripleo::cluster::cassandra::client_port: {get_param: CassandraClientPort}
                 tripleo::cluster::cassandra::client_port_thrift: {get_param: CassandraClientPortThrift}
-                tripleo::loadbalancer::midonet_api: true
+                tripleo::haproxy::midonet_api: true
                 # Missed Neutron Puppet data
                 neutron::agents::dhcp::interface_driver: 'neutron.agent.linux.interface.MidonetInterfaceDriver'
                 neutron::agents::dhcp::dhcp_driver: 'midonet.neutron.agent.midonet_driver.DhcpNoOpDriver'

diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 321ae80..81efa24 100644 (file)
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -163,26 +163,26 @@ horizon::vhost_extra_params:
 mysql::server::manage_config_file: true
 
 
-tripleo::loadbalancer::keystone_admin: true
-tripleo::loadbalancer::keystone_public: true
-tripleo::loadbalancer::neutron: true
-tripleo::loadbalancer::cinder: true
-tripleo::loadbalancer::glance_api: true
-tripleo::loadbalancer::glance_registry: true
-tripleo::loadbalancer::nova_osapi: true
-tripleo::loadbalancer::nova_metadata: true
-tripleo::loadbalancer::nova_novncproxy: true
-tripleo::loadbalancer::mysql: true
-tripleo::loadbalancer::redis: true
-tripleo::loadbalancer::sahara: true
-tripleo::loadbalancer::swift_proxy_server: true
-tripleo::loadbalancer::ceilometer: true
-tripleo::loadbalancer::aodh: true
-tripleo::loadbalancer::gnocchi: true
-tripleo::loadbalancer::heat_api: true
-tripleo::loadbalancer::heat_cloudwatch: true
-tripleo::loadbalancer::heat_cfn: true
-tripleo::loadbalancer::horizon: true
+tripleo::haproxy::keystone_admin: true
+tripleo::haproxy::keystone_public: true
+tripleo::haproxy::neutron: true
+tripleo::haproxy::cinder: true
+tripleo::haproxy::glance_api: true
+tripleo::haproxy::glance_registry: true
+tripleo::haproxy::nova_osapi: true
+tripleo::haproxy::nova_metadata: true
+tripleo::haproxy::nova_novncproxy: true
+tripleo::haproxy::mysql: true
+tripleo::haproxy::redis: true
+tripleo::haproxy::sahara: true
+tripleo::haproxy::swift_proxy_server: true
+tripleo::haproxy::ceilometer: true
+tripleo::haproxy::aodh: true
+tripleo::haproxy::gnocchi: true
+tripleo::haproxy::heat_api: true
+tripleo::haproxy::heat_cloudwatch: true
+tripleo::haproxy::heat_cfn: true
+tripleo::haproxy::horizon: true
 
 controller_classes: []
 # firewall

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 536c680..581317a 100644 (file)
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -225,8 +225,8 @@ if hiera('step') >= 4 {
 
     class {'::tripleo::network::midonet::api':
       zookeeper_servers    => $zookeeper_node_ips,
-      vip                  => hiera('tripleo::loadbalancer::public_virtual_ip'),
-      keystone_ip          => hiera('tripleo::loadbalancer::public_virtual_ip'),
+      vip                  => hiera('public_virtual_ip'),
+      keystone_ip          => hiera('public_virtual_ip'),
       keystone_admin_token => hiera('keystone::admin_token'),
       # TODO: create a 'bind' hiera key for api
       bind_address         => hiera('neutron::bind_host'),
@@ -271,7 +271,7 @@ if hiera('step') >= 4 {
     if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {
 
       class {'::neutron::plugins::midonet':
-        midonet_api_ip    => hiera('tripleo::loadbalancer::public_virtual_ip'),
+        midonet_api_ip    => hiera('public_virtual_ip'),
         keystone_tenant   => hiera('neutron::server::auth_tenant'),
         keystone_password => hiera('neutron::server::auth_password')
       }

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 3034569..4330102 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -461,8 +461,8 @@ MYSQL_HOST=localhost\n",
 
     class {'::tripleo::network::midonet::api':
       zookeeper_servers    => $zookeeper_node_ips,
-      vip                  => hiera('tripleo::loadbalancer::public_virtual_ip'),
-      keystone_ip          => hiera('tripleo::loadbalancer::public_virtual_ip'),
+      vip                  => hiera('public_virtual_ip'),
+      keystone_ip          => hiera('public_virtual_ip'),
       keystone_admin_token => hiera('keystone::admin_token'),
       # TODO: create a 'bind' hiera key for api
       bind_address         => hiera('neutron::bind_host'),
@@ -495,7 +495,7 @@ MYSQL_HOST=localhost\n",
   }
   if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {
     class {'::neutron::plugins::midonet':
-      midonet_api_ip    => hiera('tripleo::loadbalancer::public_virtual_ip'),
+      midonet_api_ip    => hiera('public_virtual_ip'),
       keystone_tenant   => hiera('neutron::server::auth_tenant'),
       keystone_password => hiera('neutron::server::auth_password')
     }

diff --git a/puppet/services/pacemaker/loadbalancer.yaml b/puppet/services/pacemaker/loadbalancer.yaml
index be6825f..ce67e92 100644 (file)
--- a/puppet/services/pacemaker/loadbalancer.yaml
+++ b/puppet/services/pacemaker/loadbalancer.yaml
@@ -23,8 +23,8 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [LoadbalancerServiceBase, role_data, config_settings]
-          - tripleo::loadbalancer::haproxy_service_manage: false
-            tripleo::loadbalancer::mysql_clustercheck: true
-            tripleo::loadbalancer::manage_vip: false
+          - tripleo::haproxy::haproxy_service_manage: false
+            tripleo::haproxy::mysql_clustercheck: true
+            tripleo::haproxy::keepalived: false
       step_config: |
         include ::tripleo::profile::pacemaker::loadbalancer

diff --git a/puppet/vip-config.yaml b/puppet/vip-config.yaml
index 3e8e918..92234b6 100644 (file)
--- a/puppet/vip-config.yaml
+++ b/puppet/vip-config.yaml
@@ -32,11 +32,20 @@ resources:
                 horizon_vip: {get_input: horizon_vip}
                 redis_vip: {get_input: redis_vip}
                 mysql_vip: {get_input: mysql_vip}
-                tripleo::loadbalancer::public_virtual_ip: {get_input: public_virtual_ip}
-                tripleo::loadbalancer::controller_virtual_ip: {get_input: control_virtual_ip}
-                tripleo::loadbalancer::internal_api_virtual_ip: {get_input: internal_api_virtual_ip}
-                tripleo::loadbalancer::storage_virtual_ip: {get_input: storage_virtual_ip}
-                tripleo::loadbalancer::storage_mgmt_virtual_ip: {get_input: storage_mgmt_virtual_ip}
+                public_virtual_ip: {get_input: public_virtual_ip}
+                controller_virtual_ip: {get_input: control_virtual_ip}
+                internal_api_virtual_ip: {get_input: internal_api_virtual_ip}
+                storage_virtual_ip: {get_input: storage_virtual_ip}
+                storage_mgmt_virtual_ip: {get_input: storage_mgmt_virtual_ip}
+                # public_virtual_ip and controller_virtual_ip are needed in
+                # both HAproxy & keepalived.
+                tripleo::haproxy::public_virtual_ip: {get_input: public_virtual_ip}
+                tripleo::haproxy::controller_virtual_ip: {get_input: control_virtual_ip}
+                tripleo::keepalived::public_virtual_ip: {get_input: public_virtual_ip}
+                tripleo::keepalived::controller_virtual_ip: {get_input: control_virtual_ip}
+                tripleo::keepalived::internal_api_virtual_ip: {get_input: internal_api_virtual_ip}
+                tripleo::keepalived::storage_virtual_ip: {get_input: storage_virtual_ip}
+                tripleo::keepalived::storage_mgmt_virtual_ip: {get_input: storage_mgmt_virtual_ip}
                 tripleo::redis_notification::haproxy_monitor_ip: {get_input: control_virtual_ip}