Merge "Make Ceilometer notifications non-blocking"

[apex-tripleo-heat-templates.git] / puppet / services / haproxy.yaml

diff --git a/puppet/services/haproxy.yaml b/puppet/services/haproxy.yaml
index 0813cb7..c8edade 100644 (file)
--- a/puppet/services/haproxy.yaml
+++ b/puppet/services/haproxy.yaml
@@ -34,16 +34,6 @@ parameters:
     description: The password for Redis
     type: string
     hidden: true
-  ControlVirtualInterface:
-    default: 'br-ex'
-    description: Interface where virtual ip will be assigned.
-    type: string
-  PublicVirtualInterface:
-    default: 'br-ex'
-    description: >
-        Specifies the interface where the public-facing virtual ip will be assigned.
-        This should be int_public when a VLAN is being used.
-    type: string
   MonitoringSubscriptionHaproxy:
     default: 'overcloud-haproxy'
     type: string
@@ -81,8 +71,6 @@ outputs:
             tripleo::haproxy::haproxy_stats_user: {get_param: HAProxyStatsUser}
             tripleo::haproxy::haproxy_stats_password: {get_param: HAProxyStatsPassword}
             tripleo::haproxy::redis_password: {get_param: RedisPassword}
-            tripleo::haproxy::control_virtual_interface: {get_param: ControlVirtualInterface}
-            tripleo::haproxy::public_virtual_interface: {get_param: PublicVirtualInterface}
             tripleo::profile::base::haproxy::certificates_specs:
               map_merge:
                 - get_attr: [HAProxyPublicTLS, role_data, certificates_specs]