charm-helpers sync
Change-Id: Ia7cc8858f4b1c5b1047a5593981efd8bb3bbe75d Related-Bug: #1787397
This commit is contained in:
parent
c6e5780f13
commit
b3321ffe77
|
@ -1523,10 +1523,6 @@ class NeutronAPIContext(OSContextGenerator):
|
||||||
'rel_key': 'enable-nsg-logging',
|
'rel_key': 'enable-nsg-logging',
|
||||||
'default': False,
|
'default': False,
|
||||||
},
|
},
|
||||||
'nsg_log_output_base': {
|
|
||||||
'rel_key': 'nsg-log-output-base',
|
|
||||||
'default': None,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
ctxt = self.get_neutron_options({})
|
ctxt = self.get_neutron_options({})
|
||||||
for rid in relation_ids('neutron-plugin-api'):
|
for rid in relation_ids('neutron-plugin-api'):
|
||||||
|
|
|
@ -1736,7 +1736,12 @@ def is_unit_upgrading_set():
|
||||||
|
|
||||||
|
|
||||||
def series_upgrade_prepare(pause_unit_helper=None, configs=None):
|
def series_upgrade_prepare(pause_unit_helper=None, configs=None):
|
||||||
""" Run common series upgrade prepare tasks."""
|
""" Run common series upgrade prepare tasks.
|
||||||
|
|
||||||
|
:param pause_unit_helper: function: Function to pause unit
|
||||||
|
:param configs: OSConfigRenderer object: Configurations
|
||||||
|
:returns None:
|
||||||
|
"""
|
||||||
set_unit_upgrading()
|
set_unit_upgrading()
|
||||||
if pause_unit_helper and configs:
|
if pause_unit_helper and configs:
|
||||||
if not is_unit_paused_set():
|
if not is_unit_paused_set():
|
||||||
|
@ -1744,8 +1749,15 @@ def series_upgrade_prepare(pause_unit_helper=None, configs=None):
|
||||||
|
|
||||||
|
|
||||||
def series_upgrade_complete(resume_unit_helper=None, configs=None):
|
def series_upgrade_complete(resume_unit_helper=None, configs=None):
|
||||||
""" Run common series upgrade complete tasks."""
|
""" Run common series upgrade complete tasks.
|
||||||
|
|
||||||
|
:param resume_unit_helper: function: Function to resume unit
|
||||||
|
:param configs: OSConfigRenderer object: Configurations
|
||||||
|
:returns None:
|
||||||
|
"""
|
||||||
clear_unit_paused()
|
clear_unit_paused()
|
||||||
clear_unit_upgrading()
|
clear_unit_upgrading()
|
||||||
if resume_unit_helper and configs:
|
if configs:
|
||||||
resume_unit_helper(configs)
|
configs.write_all()
|
||||||
|
if resume_unit_helper:
|
||||||
|
resume_unit_helper(configs)
|
||||||
|
|
|
@ -21,6 +21,7 @@ UBUNTU_RELEASES = (
|
||||||
'zesty',
|
'zesty',
|
||||||
'artful',
|
'artful',
|
||||||
'bionic',
|
'bionic',
|
||||||
|
'cosmic',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -84,6 +84,7 @@ module = "charmhelpers.fetch.%s" % __platform__
|
||||||
fetch = importlib.import_module(module)
|
fetch = importlib.import_module(module)
|
||||||
|
|
||||||
filter_installed_packages = fetch.filter_installed_packages
|
filter_installed_packages = fetch.filter_installed_packages
|
||||||
|
filter_missing_packages = fetch.filter_missing_packages
|
||||||
install = fetch.apt_install
|
install = fetch.apt_install
|
||||||
upgrade = fetch.apt_upgrade
|
upgrade = fetch.apt_upgrade
|
||||||
update = _fetch_update = fetch.apt_update
|
update = _fetch_update = fetch.apt_update
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
import os
|
import os
|
||||||
from subprocess import check_call
|
from subprocess import STDOUT, check_output
|
||||||
from charmhelpers.fetch import (
|
from charmhelpers.fetch import (
|
||||||
BaseFetchHandler,
|
BaseFetchHandler,
|
||||||
UnhandledSource,
|
UnhandledSource,
|
||||||
|
@ -55,7 +55,7 @@ class BzrUrlFetchHandler(BaseFetchHandler):
|
||||||
cmd = ['bzr', 'branch']
|
cmd = ['bzr', 'branch']
|
||||||
cmd += cmd_opts
|
cmd += cmd_opts
|
||||||
cmd += [source, dest]
|
cmd += [source, dest]
|
||||||
check_call(cmd)
|
check_output(cmd, stderr=STDOUT)
|
||||||
|
|
||||||
def install(self, source, dest=None, revno=None):
|
def install(self, source, dest=None, revno=None):
|
||||||
url_parts = self.parse_url(source)
|
url_parts = self.parse_url(source)
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
import os
|
import os
|
||||||
from subprocess import check_call, CalledProcessError
|
from subprocess import check_output, CalledProcessError, STDOUT
|
||||||
from charmhelpers.fetch import (
|
from charmhelpers.fetch import (
|
||||||
BaseFetchHandler,
|
BaseFetchHandler,
|
||||||
UnhandledSource,
|
UnhandledSource,
|
||||||
|
@ -50,7 +50,7 @@ class GitUrlFetchHandler(BaseFetchHandler):
|
||||||
cmd = ['git', 'clone', source, dest, '--branch', branch]
|
cmd = ['git', 'clone', source, dest, '--branch', branch]
|
||||||
if depth:
|
if depth:
|
||||||
cmd.extend(['--depth', depth])
|
cmd.extend(['--depth', depth])
|
||||||
check_call(cmd)
|
check_output(cmd, stderr=STDOUT)
|
||||||
|
|
||||||
def install(self, source, branch="master", dest=None, depth=None):
|
def install(self, source, branch="master", dest=None, depth=None):
|
||||||
url_parts = self.parse_url(source)
|
url_parts = self.parse_url(source)
|
||||||
|
|
|
@ -189,6 +189,18 @@ def filter_installed_packages(packages):
|
||||||
return _pkgs
|
return _pkgs
|
||||||
|
|
||||||
|
|
||||||
|
def filter_missing_packages(packages):
|
||||||
|
"""Return a list of packages that are installed.
|
||||||
|
|
||||||
|
:param packages: list of packages to evaluate.
|
||||||
|
:returns list: Packages that are installed.
|
||||||
|
"""
|
||||||
|
return list(
|
||||||
|
set(packages) -
|
||||||
|
set(filter_installed_packages(packages))
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def apt_cache(in_memory=True, progress=None):
|
def apt_cache(in_memory=True, progress=None):
|
||||||
"""Build and return an apt cache."""
|
"""Build and return an apt cache."""
|
||||||
from apt import apt_pkg
|
from apt import apt_pkg
|
||||||
|
|
|
@ -21,6 +21,7 @@ UBUNTU_RELEASES = (
|
||||||
'zesty',
|
'zesty',
|
||||||
'artful',
|
'artful',
|
||||||
'bionic',
|
'bionic',
|
||||||
|
'cosmic',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue