openstack/charm-ceph-osd
Code Issues Proposed changes

Handle package installs before anything else

Browse Source 
Handling other functions of the charm upgrade before possible
new packages leads to breakages when dependencies are unmet

Change-Id: I0e4857d0d03c2d076290a4cc6a08dc1e6d5e1610
Closes-Bug: #1819669
This commit is contained in:
Chris MacNaughton
2019-03-12 14:55:53 +01:00
parent 37b1e7548b
commit 4e13ede1da
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/ceph_hooks.py
View File

@@ -630,10 +630,10 @@ def mon_relation():
@hooks.hook('upgrade-charm.real') @hooks.hook('upgrade-charm.real')
@harden() @harden()
def upgrade_charm(): def upgrade_charm():
if get_fsid() and get_auth():
emit_cephconf()
apt_install(packages=filter_installed_packages(ceph.determine_packages()), apt_install(packages=filter_installed_packages(ceph.determine_packages()),
fatal=True) fatal=True)
if get_fsid() and get_auth():
emit_cephconf()
install_udev_rules() install_udev_rules()
remap_resolved_targets() remap_resolved_targets()
maybe_refresh_nrpe_files() maybe_refresh_nrpe_files()