Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed prepare service variable access #294

Merged
merged 1 commit into from
Oct 21, 2024
Merged

Fixed prepare service variable access #294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions suse_migration_services/units/prepare.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@ def main():
]
cache_cloudregister_path = '/var/cache/cloudregister'
cloud_register_certs_path_fallback = '/usr/lib/regionService/certs'
cloud_register_certs_bind_mount_path = ''

cloud_register_metadata = ""
cloud_register_metadata = ''

if os.path.exists(suse_connect_setup):
shutil.copy(
Expand All @@ -88,6 +89,8 @@ def main():
suse_cloud_regionsrv_setup,
cloud_register_certs_path_fallback
)
cloud_register_certs_bind_mount_path = \
root_path + cloud_register_certs_path
report_if_regionsrv_certs_not_found(
root_path + cloud_register_certs_path, log
)
Expand Down Expand Up @@ -202,8 +205,6 @@ def main():
cache_cloudregister_path
]
)
cloud_register_certs_bind_mount_path = \
root_path + cloud_register_certs_path
if os.path.exists(cloud_register_certs_bind_mount_path):
log.info(
'Bind mounting {0} from {1}'.format(
Expand Down Expand Up @@ -232,6 +233,12 @@ def main():
)
# Check if system is registered
migration_config = MigrationConfig()
migration_config.update_migration_config_file()
log.info(
'Config file content:\n{content}\n'. format(
content=migration_config.get_migration_config_file_content()
)
)
if migration_config.is_zypper_migration_plugin_requested():
if not SUSEConnect.is_registered():
message = 'System not registered. Aborting migration.'
Expand Down
Loading