Sync charm-helpers for Victoria/Groovy updates
This sync picks up the release and version details for Victoria/Groovy. Change-Id: I8d589d1739aef94e2d7cbdca6b5e78355d5551be
This commit is contained in:
parent
0b32f37815
commit
010ac09350
@ -300,6 +300,8 @@ class OpenStackAmuletDeployment(AmuletDeployment):
|
||||
('disco', None): self.disco_stein,
|
||||
('eoan', None): self.eoan_train,
|
||||
('focal', None): self.focal_ussuri,
|
||||
('focal', 'cloud:focal-victoria'): self.focal_victoria,
|
||||
('groovy', None): self.groovy_victoria,
|
||||
}
|
||||
return releases[(self.series, self.openstack)]
|
||||
|
||||
@ -319,6 +321,7 @@ class OpenStackAmuletDeployment(AmuletDeployment):
|
||||
('disco', 'stein'),
|
||||
('eoan', 'train'),
|
||||
('focal', 'ussuri'),
|
||||
('groovy', 'victoria'),
|
||||
])
|
||||
if self.openstack:
|
||||
os_origin = self.openstack.split(':')[1]
|
||||
|
@ -63,6 +63,7 @@ OPENSTACK_RELEASES_PAIRS = [
|
||||
'bionic_stein', 'disco_stein',
|
||||
'bionic_train', 'eoan_train',
|
||||
'bionic_ussuri', 'focal_ussuri',
|
||||
'focal_victoria', 'groovy_victoria',
|
||||
]
|
||||
|
||||
|
||||
|
@ -721,6 +721,12 @@ class AMQPContext(OSContextGenerator):
|
||||
rabbitmq_hosts = []
|
||||
for unit in related_units(rid):
|
||||
host = relation_get('private-address', rid=rid, unit=unit)
|
||||
if not relation_get('password', rid=rid, unit=unit):
|
||||
log(
|
||||
("Skipping {} password not sent which indicates "
|
||||
"unit is not ready.".format(host)),
|
||||
level=DEBUG)
|
||||
continue
|
||||
host = format_ipv6_addr(host) or host
|
||||
rabbitmq_hosts.append(host)
|
||||
|
||||
@ -2714,6 +2720,19 @@ class BridgePortInterfaceMap(object):
|
||||
self._ifname_mac_map[ifname] = [mac]
|
||||
self._mac_ifname_map[mac] = ifname
|
||||
|
||||
# check if interface is part of a linux bond
|
||||
_bond_name = get_bond_master(ifname)
|
||||
if _bond_name and _bond_name != ifname:
|
||||
log('Add linux bond "{}" to map for physical interface "{}" '
|
||||
'with mac "{}".'.format(_bond_name, ifname, mac),
|
||||
level=DEBUG)
|
||||
# for bonds we want to be able to get a list of the mac
|
||||
# addresses for the physical interfaces the bond is made up of.
|
||||
if self._ifname_mac_map.get(_bond_name):
|
||||
self._ifname_mac_map[_bond_name].append(mac)
|
||||
else:
|
||||
self._ifname_mac_map[_bond_name] = [mac]
|
||||
|
||||
# In light of the pre-deprecation notice in the docstring of this
|
||||
# class we will expose the ability to configure OVS bonds as a
|
||||
# DPDK-only feature, but generally use the data structures internally.
|
||||
@ -2779,6 +2798,17 @@ class BridgePortInterfaceMap(object):
|
||||
self.add_interface(
|
||||
bridge, portname, ifname, iftype, pci_address, global_mtu)
|
||||
|
||||
if not macs:
|
||||
# We have not mapped the interface and it is probably some sort
|
||||
# of virtual interface. Our user have put it in the config with
|
||||
# a purpose so let's carry out their wish. LP: #1884743
|
||||
log('Add unmapped interface from config: name "{}" bridge "{}"'
|
||||
.format(ifname, bridge),
|
||||
level=DEBUG)
|
||||
self.add_interface(
|
||||
bridge, ifname, ifname, self.interface_type.system, None,
|
||||
global_mtu)
|
||||
|
||||
def __getitem__(self, key):
|
||||
"""Provide a Dict-like interface, get value of item.
|
||||
|
||||
|
@ -143,6 +143,7 @@ OPENSTACK_RELEASES = (
|
||||
'stein',
|
||||
'train',
|
||||
'ussuri',
|
||||
'victoria',
|
||||
)
|
||||
|
||||
UBUNTU_OPENSTACK_RELEASE = OrderedDict([
|
||||
@ -164,6 +165,7 @@ UBUNTU_OPENSTACK_RELEASE = OrderedDict([
|
||||
('disco', 'stein'),
|
||||
('eoan', 'train'),
|
||||
('focal', 'ussuri'),
|
||||
('groovy', 'victoria'),
|
||||
])
|
||||
|
||||
|
||||
@ -186,6 +188,7 @@ OPENSTACK_CODENAMES = OrderedDict([
|
||||
('2019.1', 'stein'),
|
||||
('2019.2', 'train'),
|
||||
('2020.1', 'ussuri'),
|
||||
('2020.2', 'victoria'),
|
||||
])
|
||||
|
||||
# The ugly duckling - must list releases oldest to newest
|
||||
@ -226,6 +229,8 @@ SWIFT_CODENAMES = OrderedDict([
|
||||
['2.22.0', '2.23.0']),
|
||||
('ussuri',
|
||||
['2.24.0', '2.25.0']),
|
||||
('victoria',
|
||||
['2.25.0']),
|
||||
])
|
||||
|
||||
# >= Liberty version->codename mapping
|
||||
@ -241,6 +246,7 @@ PACKAGE_CODENAMES = {
|
||||
('19', 'stein'),
|
||||
('20', 'train'),
|
||||
('21', 'ussuri'),
|
||||
('22', 'victoria'),
|
||||
]),
|
||||
'neutron-common': OrderedDict([
|
||||
('7', 'liberty'),
|
||||
@ -253,6 +259,7 @@ PACKAGE_CODENAMES = {
|
||||
('14', 'stein'),
|
||||
('15', 'train'),
|
||||
('16', 'ussuri'),
|
||||
('17', 'victoria'),
|
||||
]),
|
||||
'cinder-common': OrderedDict([
|
||||
('7', 'liberty'),
|
||||
@ -265,6 +272,7 @@ PACKAGE_CODENAMES = {
|
||||
('14', 'stein'),
|
||||
('15', 'train'),
|
||||
('16', 'ussuri'),
|
||||
('17', 'victoria'),
|
||||
]),
|
||||
'keystone': OrderedDict([
|
||||
('8', 'liberty'),
|
||||
@ -277,6 +285,7 @@ PACKAGE_CODENAMES = {
|
||||
('15', 'stein'),
|
||||
('16', 'train'),
|
||||
('17', 'ussuri'),
|
||||
('18', 'victoria'),
|
||||
]),
|
||||
'horizon-common': OrderedDict([
|
||||
('8', 'liberty'),
|
||||
@ -289,6 +298,7 @@ PACKAGE_CODENAMES = {
|
||||
('15', 'stein'),
|
||||
('16', 'train'),
|
||||
('18', 'ussuri'),
|
||||
('19', 'victoria'),
|
||||
]),
|
||||
'ceilometer-common': OrderedDict([
|
||||
('5', 'liberty'),
|
||||
@ -301,6 +311,7 @@ PACKAGE_CODENAMES = {
|
||||
('12', 'stein'),
|
||||
('13', 'train'),
|
||||
('14', 'ussuri'),
|
||||
('15', 'victoria'),
|
||||
]),
|
||||
'heat-common': OrderedDict([
|
||||
('5', 'liberty'),
|
||||
@ -313,6 +324,7 @@ PACKAGE_CODENAMES = {
|
||||
('12', 'stein'),
|
||||
('13', 'train'),
|
||||
('14', 'ussuri'),
|
||||
('15', 'victoria'),
|
||||
]),
|
||||
'glance-common': OrderedDict([
|
||||
('11', 'liberty'),
|
||||
@ -325,6 +337,7 @@ PACKAGE_CODENAMES = {
|
||||
('18', 'stein'),
|
||||
('19', 'train'),
|
||||
('20', 'ussuri'),
|
||||
('21', 'victoria'),
|
||||
]),
|
||||
'openstack-dashboard': OrderedDict([
|
||||
('8', 'liberty'),
|
||||
@ -337,6 +350,7 @@ PACKAGE_CODENAMES = {
|
||||
('15', 'stein'),
|
||||
('16', 'train'),
|
||||
('18', 'ussuri'),
|
||||
('19', 'victoria'),
|
||||
]),
|
||||
}
|
||||
|
||||
|
@ -372,8 +372,10 @@ class Config(dict):
|
||||
try:
|
||||
self._prev_dict = json.load(f)
|
||||
except ValueError as e:
|
||||
log('Unable to parse previous config data - {}'.format(str(e)),
|
||||
level=ERROR)
|
||||
log('Found but was unable to parse previous config data, '
|
||||
'ignoring which will report all values as changed - {}'
|
||||
.format(str(e)), level=ERROR)
|
||||
return
|
||||
for k, v in copy.deepcopy(self._prev_dict).items():
|
||||
if k not in self:
|
||||
self[k] = v
|
||||
|
@ -190,6 +190,14 @@ CLOUD_ARCHIVE_POCKETS = {
|
||||
'ussuri/proposed': 'bionic-proposed/ussuri',
|
||||
'bionic-ussuri/proposed': 'bionic-proposed/ussuri',
|
||||
'bionic-proposed/ussuri': 'bionic-proposed/ussuri',
|
||||
# Victoria
|
||||
'victoria': 'focal-updates/victoria',
|
||||
'focal-victoria': 'focal-updates/victoria',
|
||||
'focal-victoria/updates': 'focal-updates/victoria',
|
||||
'focal-updates/victoria': 'focal-updates/victoria',
|
||||
'victoria/proposed': 'focal-proposed/victoria',
|
||||
'focal-victoria/proposed': 'focal-proposed/victoria',
|
||||
'focal-proposed/victoria': 'focal-proposed/victoria',
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user