Merge "Deprecate KeepalivedRestart"
This commit is contained in:
commit
bb39b3a938
|
@ -36,12 +36,6 @@ parameters:
|
||||||
default: {}
|
default: {}
|
||||||
description: Parameters specific to the role
|
description: Parameters specific to the role
|
||||||
type: json
|
type: json
|
||||||
# TODO(emilien) Remove when Keepalived 2.0.6 is out
|
|
||||||
# https://bugs.launchpad.net/tripleo/+bug/1791238
|
|
||||||
KeepalivedRestart:
|
|
||||||
default: false
|
|
||||||
description: Whether or not restart Keepalived. Useful for Undercloud only.
|
|
||||||
type: boolean
|
|
||||||
ControlVirtualInterface:
|
ControlVirtualInterface:
|
||||||
default: ''
|
default: ''
|
||||||
description: >
|
description: >
|
||||||
|
@ -59,6 +53,22 @@ parameters:
|
||||||
MonitoringSubscriptionKeepalived:
|
MonitoringSubscriptionKeepalived:
|
||||||
default: 'overcloud-keepalived'
|
default: 'overcloud-keepalived'
|
||||||
type: string
|
type: string
|
||||||
|
# DEPRECATED: the following options are deprecated and are currently maintained
|
||||||
|
# for backwards compatibility. They will be removed in future release.
|
||||||
|
KeepalivedRestart:
|
||||||
|
default: false
|
||||||
|
description: Whether or not restart Keepalived. Deprecated and no effect.
|
||||||
|
type: boolean
|
||||||
|
|
||||||
|
parameter_groups:
|
||||||
|
- label: deprecated
|
||||||
|
description: |
|
||||||
|
The following parameters are deprecated and will be removed. They should not
|
||||||
|
be relied on for new deployments. If you have concerns regarding deprecated
|
||||||
|
parameters, please contact the TripleO development team on IRC or the
|
||||||
|
OpenStack mailing list.
|
||||||
|
parameters:
|
||||||
|
- KeepalivedRestart
|
||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
control_iface_empty: {equals : [{get_param: ControlVirtualInterface}, '']}
|
control_iface_empty: {equals : [{get_param: ControlVirtualInterface}, '']}
|
||||||
|
@ -130,13 +140,6 @@ outputs:
|
||||||
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
||||||
command: /usr/local/bin/kolla_start
|
command: /usr/local/bin/kolla_start
|
||||||
host_prep_tasks:
|
host_prep_tasks:
|
||||||
- name: Set fact for restarting Keepalived container
|
|
||||||
set_fact:
|
|
||||||
restart_keepalived: {get_param: KeepalivedRestart}
|
|
||||||
- name: Restart Keepalived container
|
|
||||||
shell: "{{container_cli}} restart keepalived"
|
|
||||||
when: restart_keepalived|bool
|
|
||||||
failed_when: false
|
|
||||||
- name: load ip_vs module
|
- name: load ip_vs module
|
||||||
import_role:
|
import_role:
|
||||||
name: tripleo_module_load
|
name: tripleo_module_load
|
||||||
|
|
|
@ -201,9 +201,6 @@ parameter_defaults:
|
||||||
MySQLServerOptions:
|
MySQLServerOptions:
|
||||||
mysqld:
|
mysqld:
|
||||||
connect_timeout: 60
|
connect_timeout: 60
|
||||||
# TODO(emilien) Remove when Keepalived 2.0.6 is out
|
|
||||||
# https://bugs.launchpad.net/tripleo/+bug/1791238
|
|
||||||
KeepalivedRestart: true
|
|
||||||
SshFirewallAllowAll: true
|
SshFirewallAllowAll: true
|
||||||
UndercloudExtraConfig:
|
UndercloudExtraConfig:
|
||||||
aodh::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
|
aodh::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
KeepalivedRestart is deprecated and has no effect. The workaround isn't
|
||||||
|
needed anymore since we now deploy keepalived-2.0.10-4.
|
||||||
|
This version has support for 'dynamic_interfaces' which is required when
|
||||||
|
the network config was changed and os-net-config restarts the network
|
||||||
|
interface.
|
Loading…
Reference in New Issue