Browse Source

Enables auto-detection for VIP interfaces

Previously the ctrl plane VIP would default to 'br-ex' which in non-vlan
deployments ends up being the wrong interface.  The public VIP interface
was also defaulted to 'br-ex' which would be incorrect for vlan based
deployments.  Since a user has already given the nic template (and in
most cases the subnet that corresponds to the nic) the installer should
be able to figure out which interface the public/control vip should be
on.

These changes enable that type of auto-detection, unless a user
explicitly overrides the heat parameters for ControlVirtualInterface and
PublicVirtualInterface.  Also, incorrect parameters from haproxy service
are removed.

Depends-On: I05105fce85be8ace986db351cdca2916f405ed04

Closes-Bug: 1606632

Change-Id: I3c1c39824ec32ced304a782edc6ef49c0769c108
Signed-off-by: Tim Rozet <trozet@redhat.com>
tags/6.0.0.0b2
Tim Rozet 2 years ago
parent
commit
f49d4d23f6
2 changed files with 9 additions and 17 deletions
  1. 0
    12
      puppet/services/haproxy.yaml
  2. 9
    5
      puppet/services/keepalived.yaml

+ 0
- 12
puppet/services/haproxy.yaml View File

@@ -34,16 +34,6 @@ parameters:
34 34
     description: The password for Redis
35 35
     type: string
36 36
     hidden: true
37
-  ControlVirtualInterface:
38
-    default: 'br-ex'
39
-    description: Interface where virtual ip will be assigned.
40
-    type: string
41
-  PublicVirtualInterface:
42
-    default: 'br-ex'
43
-    description: >
44
-        Specifies the interface where the public-facing virtual ip will be assigned.
45
-        This should be int_public when a VLAN is being used.
46
-    type: string
47 37
   MonitoringSubscriptionHaproxy:
48 38
     default: 'overcloud-haproxy'
49 39
     type: string
@@ -81,8 +71,6 @@ outputs:
81 71
             tripleo::haproxy::haproxy_stats_user: {get_param: HAProxyStatsUser}
82 72
             tripleo::haproxy::haproxy_stats_password: {get_param: HAProxyStatsPassword}
83 73
             tripleo::haproxy::redis_password: {get_param: RedisPassword}
84
-            tripleo::haproxy::control_virtual_interface: {get_param: ControlVirtualInterface}
85
-            tripleo::haproxy::public_virtual_interface: {get_param: PublicVirtualInterface}
86 74
             tripleo::profile::base::haproxy::certificates_specs:
87 75
               map_merge:
88 76
                 - get_attr: [HAProxyPublicTLS, role_data, certificates_specs]

+ 9
- 5
puppet/services/keepalived.yaml View File

@@ -19,14 +19,18 @@ parameters:
19 19
                  via parameter_defaults in the resource registry.
20 20
     type: json
21 21
   ControlVirtualInterface:
22
-    default: 'br-ex'
23
-    description: Interface where virtual ip will be assigned.
22
+    default: ''
23
+    description: >
24
+        Interface where virtual ip will be assigned.  This value will be
25
+        automatically set by the deployment tool.  Overriding here will
26
+        override automatic setting.
24 27
     type: string
25 28
   PublicVirtualInterface:
26
-    default: 'br-ex'
29
+    default: ''
27 30
     description: >
28
-        Specifies the interface where the public-facing virtual ip will be assigned.
29
-        This should be int_public when a VLAN is being used.
31
+        Interface where virtual ip will be assigned.  This value will be
32
+        automatically set by the deployment tool.  Overriding here will
33
+        override automatic setting.
30 34
     type: string
31 35
   MonitoringSubscriptionKeepalived:
32 36
     default: 'overcloud-keepalived'

Loading…
Cancel
Save