Remove leftover for undercloud keepalived service
Currently environments/services/undercloud-keepalived.yaml is included
when undercloud SSL is enabled but this file is no longer effective
since the Keepalived service was removed from undercloud role data[1].
[1] c712355e4bae4ef2fc1b83e5603c0364dbd50a78
Because VIPs are managed by os-net-config now and we don't expect any
situation where users requires keepalived running in undercloud,
this change simply removes all remaining implementation for undercloud
keepalived service.
Closes-Bug: #1926314
Change-Id: I9d9dea09a36914cffaef1d251c49f3c4fea4fa68
(cherry picked from commit b02acaa6e1
)
This commit is contained in:
parent
f2f40a98e4
commit
a447a5fbbd
|
@ -103,9 +103,7 @@ class TestUndercloudInstall(TestPluginV1):
|
|||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'ssl/tls-endpoints-public-ip.yaml', '-e',
|
||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'services/undercloud-haproxy.yaml', '-e',
|
||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'services/undercloud-keepalived.yaml',
|
||||
'services/undercloud-haproxy.yaml',
|
||||
# TODO(cjeanner) drop once we have proper oslo.privsep
|
||||
'--deployment-user', 'stack',
|
||||
'--output-dir=/home/stack', '--cleanup',
|
||||
|
@ -165,8 +163,7 @@ class TestUndercloudInstall(TestPluginV1):
|
|||
'--public-virtual-ip', '192.168.24.2',
|
||||
'--control-virtual-ip', '192.168.24.3', '-e',
|
||||
'/usertht/environments/ssl/tls-endpoints-public-ip.yaml', '-e',
|
||||
'/usertht/environments/services/undercloud-haproxy.yaml', '-e',
|
||||
'/usertht/environments/services/undercloud-keepalived.yaml',
|
||||
'/usertht/environments/services/undercloud-haproxy.yaml',
|
||||
# TODO(cjeanner) drop once we have proper oslo.privsep
|
||||
'--deployment-user', 'stack',
|
||||
'--output-dir=/foo', '--cleanup', '-e',
|
||||
|
@ -331,9 +328,7 @@ class TestUndercloudInstall(TestPluginV1):
|
|||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'ssl/tls-endpoints-public-ip.yaml', '-e',
|
||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'services/undercloud-haproxy.yaml', '-e',
|
||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'services/undercloud-keepalived.yaml',
|
||||
'services/undercloud-haproxy.yaml',
|
||||
# TODO(cjeanner) drop once we have proper oslo.privsep
|
||||
'--deployment-user', 'stack',
|
||||
'--output-dir=/home/stack',
|
||||
|
@ -398,9 +393,7 @@ class TestUndercloudInstall(TestPluginV1):
|
|||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'ssl/tls-endpoints-public-ip.yaml', '-e',
|
||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'services/undercloud-haproxy.yaml', '-e',
|
||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'services/undercloud-keepalived.yaml',
|
||||
'services/undercloud-haproxy.yaml',
|
||||
# TODO(cjeanner) drop once we have proper oslo.privsep
|
||||
'--deployment-user', 'stack',
|
||||
'--output-dir=/home/stack', '--cleanup',
|
||||
|
@ -461,9 +454,7 @@ class TestUndercloudInstall(TestPluginV1):
|
|||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'ssl/tls-endpoints-public-ip.yaml', '-e',
|
||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'services/undercloud-haproxy.yaml', '-e',
|
||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'services/undercloud-keepalived.yaml',
|
||||
'services/undercloud-haproxy.yaml',
|
||||
# TODO(cjeanner) drop once we have proper oslo.privsep
|
||||
'--deployment-user', 'stack',
|
||||
'--output-dir=/home/stack', '--cleanup',
|
||||
|
@ -525,9 +516,7 @@ class TestUndercloudInstall(TestPluginV1):
|
|||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'ssl/tls-endpoints-public-ip.yaml', '-e',
|
||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'services/undercloud-haproxy.yaml', '-e',
|
||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'services/undercloud-keepalived.yaml',
|
||||
'services/undercloud-haproxy.yaml',
|
||||
'--deployment-user', 'stack',
|
||||
'--output-dir=/home/stack', '--cleanup',
|
||||
'-e', '/home/stack/tripleo-config-generated-env-files/'
|
||||
|
@ -671,9 +660,7 @@ class TestUndercloudUpgrade(TestPluginV1):
|
|||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'ssl/tls-endpoints-public-ip.yaml', '-e',
|
||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'services/undercloud-haproxy.yaml', '-e',
|
||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'services/undercloud-keepalived.yaml',
|
||||
'services/undercloud-haproxy.yaml',
|
||||
# TODO(cjeanner) drop once we have proper oslo.privsep
|
||||
'--deployment-user', 'stack',
|
||||
'--output-dir=/home/stack', '--cleanup',
|
||||
|
@ -738,9 +725,7 @@ class TestUndercloudUpgrade(TestPluginV1):
|
|||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'ssl/tls-endpoints-public-ip.yaml', '-e',
|
||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'services/undercloud-haproxy.yaml', '-e',
|
||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'services/undercloud-keepalived.yaml',
|
||||
'services/undercloud-haproxy.yaml',
|
||||
'--deployment-user', 'stack',
|
||||
'--output-dir=/home/stack', '--cleanup',
|
||||
'-e', '/home/stack/tripleo-config-generated-env-files/'
|
||||
|
@ -804,9 +789,7 @@ class TestUndercloudUpgrade(TestPluginV1):
|
|||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'ssl/tls-endpoints-public-ip.yaml', '-e',
|
||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'services/undercloud-haproxy.yaml', '-e',
|
||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'services/undercloud-keepalived.yaml',
|
||||
'services/undercloud-haproxy.yaml',
|
||||
# TODO(cjeanner) drop once we have proper oslo.privsep
|
||||
'--deployment-user', 'stack',
|
||||
'--output-dir=/home/stack', '--cleanup',
|
||||
|
@ -868,9 +851,7 @@ class TestUndercloudUpgrade(TestPluginV1):
|
|||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'ssl/tls-endpoints-public-ip.yaml', '-e',
|
||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'services/undercloud-haproxy.yaml', '-e',
|
||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'services/undercloud-keepalived.yaml',
|
||||
'services/undercloud-haproxy.yaml',
|
||||
# TODO(cjeanner) drop once we have proper oslo.privsep
|
||||
'--deployment-user', 'stack',
|
||||
'--output-dir=/home/stack', '--cleanup',
|
||||
|
@ -938,9 +919,7 @@ class TestUndercloudUpgrade(TestPluginV1):
|
|||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'ssl/tls-endpoints-public-ip.yaml', '-e',
|
||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'services/undercloud-haproxy.yaml', '-e',
|
||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||
'services/undercloud-keepalived.yaml',
|
||||
'services/undercloud-haproxy.yaml',
|
||||
'--deployment-user', 'stack',
|
||||
'--output-dir=/home/stack', '--cleanup',
|
||||
'-e', '/home/stack/tripleo-config-generated-env-files/'
|
||||
|
|
|
@ -721,41 +721,17 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
|
|||
admin_ip = netaddr.IPAddress(admin_host)
|
||||
deploy_args += ['--control-virtual-ip', admin_host]
|
||||
|
||||
if CONF.get('net_config_override', None):
|
||||
if (admin_ip not in local_net.cidr):
|
||||
LOG.warning('You may need to specify a custom '
|
||||
'ControlVirtualInterface in a custom env file to '
|
||||
'correctly assign the ip address to an interface '
|
||||
'for undercloud_admin_host. By default it will be '
|
||||
'set to br-ctlplane.')
|
||||
if (public_ip not in local_net.cidr):
|
||||
LOG.warning('You may need to specify a custom '
|
||||
'PublicVirtualInterface in a custom env file to '
|
||||
'correctly assign the ip address to an interface '
|
||||
'for undercloud_public_host. By default it will be'
|
||||
' set to br-ctlplane.')
|
||||
else:
|
||||
if not CONF.get('net_config_override', None):
|
||||
if (admin_ip not in local_net.cidr or
|
||||
public_ip not in local_net.cidr):
|
||||
LOG.warning('undercloud_admin_host or undercloud_public_host '
|
||||
'is not in the same cidr as local_ip.')
|
||||
|
||||
# Define the *VirtualInterfaces for keepalived. These are used when
|
||||
# configuring the undercloud_*_host addresses. If these adddesses are
|
||||
# not in the default cidr for the ctlplane, it will not be defined
|
||||
# and leads to general sadness during the deployment. Our default
|
||||
# net_config uses br-ctlplane. See rhbz#1737150
|
||||
env_data['ControlVirtualInterface'] = 'br-ctlplane'
|
||||
env_data['PublicVirtualInterface'] = 'br-ctlplane'
|
||||
|
||||
deploy_args += [
|
||||
'-e', endpoint_environment,
|
||||
'-e', os.path.join(
|
||||
tht_templates,
|
||||
'environments/services/undercloud-haproxy.yaml'),
|
||||
'-e', os.path.join(
|
||||
tht_templates,
|
||||
'environments/services/undercloud-keepalived.yaml')]
|
||||
'environments/services/undercloud-haproxy.yaml')]
|
||||
|
||||
u = CONF.get('deployment_user') or utils.get_deployment_user()
|
||||
env_data['DeploymentUser'] = u
|
||||
|
|
Loading…
Reference in New Issue