b5e250513b
Previous attempts to fix LP Bug#1784083 added a workaround (commit
820ed808) which is being removed here.
The root cause seems to be upstream in the dragent. It may never have
been envisioned to run the agent by itself the way the charm does.
So that even if neutron-api completes its amqp relation first,
neutron-dynamic-routing can still see
oslo_messaging.exceptions.MessagingTimeout errors. Some operation
must occur against neutron before dragent is truly ready. i.e. some post
deploy openstack command. So it is outside the purview of the charm.
This change adds a service restart late.
Partial-Bug: #1841459
104 lines
3.5 KiB
Python
104 lines
3.5 KiB
Python
#!/usr/bin/env python3
|
|
|
|
# Copyright 2018 Canonical Ltd.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
"""Setup for BGP deployments."""
|
|
|
|
import logging
|
|
import zaza.model
|
|
from zaza.openstack.configure import (
|
|
network,
|
|
bgp_speaker,
|
|
)
|
|
from zaza.openstack.utilities import (
|
|
cli as cli_utils,
|
|
generic as generic_utils,
|
|
openstack as openstack_utils,
|
|
)
|
|
|
|
DEFAULT_PEER_APPLICATION_NAME = "quagga"
|
|
|
|
# The overcloud network configuration settings are declared.
|
|
# These are the network configuration settings under test.
|
|
OVERCLOUD_NETWORK_CONFIG = {
|
|
"network_type": "gre",
|
|
"router_name": "provider-router",
|
|
"ip_version": "4",
|
|
"address_scope": "public",
|
|
"external_net_name": "ext_net",
|
|
"external_subnet_name": "ext_net_subnet",
|
|
"prefix_len": "24",
|
|
"subnetpool_name": "pooled_subnets",
|
|
"subnetpool_prefix": "192.168.0.0/16",
|
|
}
|
|
|
|
# The undercloud network configuration settings are substrate specific to
|
|
# the environment where the tests are being executed. These settings may be
|
|
# overridden by environment variables. See the doc string documentation for
|
|
# zaza.openstack.utilities.generic_utils.get_undercloud_env_vars for the
|
|
# environment variables required to be exported and available to zaza.
|
|
# These are default settings provided as an example.
|
|
DEFAULT_UNDERCLOUD_NETWORK_CONFIG = {
|
|
"start_floating_ip": "10.5.150.0",
|
|
"end_floating_ip": "10.5.150.254",
|
|
"external_dns": "10.5.0.2",
|
|
"external_net_cidr": "10.5.0.0/16",
|
|
"default_gateway": "10.5.0.1",
|
|
}
|
|
|
|
|
|
def setup():
|
|
"""Run setup for BGP networking.
|
|
|
|
Configure the following:
|
|
The overcloud network using subnet pools
|
|
The overcloud BGP speaker
|
|
The BGP peer
|
|
Advertising of the FIPs via BGP
|
|
Advertising of the project network(s) via BGP
|
|
|
|
:returns: None
|
|
:rtype: None
|
|
"""
|
|
cli_utils.setup_logging()
|
|
|
|
# Get network configuration settings
|
|
network_config = {}
|
|
# Declared overcloud settings
|
|
network_config.update(OVERCLOUD_NETWORK_CONFIG)
|
|
# Default undercloud settings
|
|
network_config.update(DEFAULT_UNDERCLOUD_NETWORK_CONFIG)
|
|
# Environment specific settings
|
|
network_config.update(generic_utils.get_undercloud_env_vars())
|
|
|
|
# Get keystone session
|
|
keystone_session = openstack_utils.get_overcloud_keystone_session()
|
|
|
|
# Confugre the overcloud network
|
|
network.setup_sdn(network_config, keystone_session=keystone_session)
|
|
|
|
# LP Bugs #1784083 and #1841459, require a late restart of the
|
|
# neutron-bgp-dragent service
|
|
logging.warning("Due to LP Bugs #1784083 and #1841459, we require a late "
|
|
"restart of the neutron-bgp-dragent service before "
|
|
"setting up BGP.")
|
|
for unit in zaza.model.get_units("neutron-dynamic-routing"):
|
|
generic_utils.systemctl(unit, "neutron-bgp-dragent", command="restart")
|
|
|
|
# Configure BGP
|
|
bgp_speaker.setup_bgp_speaker(
|
|
peer_application_name=DEFAULT_PEER_APPLICATION_NAME,
|
|
keystone_session=keystone_session)
|