Remove magnum from baremetal.
Magnum is no longer packaged on bare metal. The sysinv and upgrades code related to magnum has been removed. The helm configuration for magnum remains, although it is not currently supported in containers either. The magnum-ui is not installed in platform or containerized horizon so the code to enable it is removed. Some upgrade code remains, due to the fact that that utility is in the process of being re-written. Story: 2004764 Task: 34333 Change-Id: I56873b4e04aac2e7d0cd57909beea00ecc2c1b9a Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
@@ -90,9 +90,6 @@ def get_db_credentials(shared_services, from_release):
|
||||
'sysinv': {'hiera_user_key': 'sysinv::db::postgresql::user',
|
||||
'keyring_password_key': 'sysinv',
|
||||
},
|
||||
'magnum': {'hiera_user_key': 'magnum::db::postgresql::user',
|
||||
'keyring_password_key': 'magnum',
|
||||
},
|
||||
'ironic': {'hiera_user_key': 'ironic::db::postgresql::user',
|
||||
'keyring_password_key': 'ironic',
|
||||
},
|
||||
@@ -532,10 +529,6 @@ def migrate_databases(from_release, shared_services, db_credentials,
|
||||
f.write("[api_database]\n")
|
||||
f.write(get_connection_string(db_credentials, 'nova_api'))
|
||||
|
||||
with open("/etc/magnum/magnum-dbsync.conf", "w") as f:
|
||||
f.write("[database]\n")
|
||||
f.write(get_connection_string(db_credentials, 'magnum'))
|
||||
|
||||
with open("/etc/ironic/ironic-dbsync.conf", "w") as f:
|
||||
f.write("[database]\n")
|
||||
f.write(get_connection_string(db_credentials, 'ironic'))
|
||||
@@ -572,10 +565,6 @@ def migrate_databases(from_release, shared_services, db_credentials,
|
||||
# Migrate nova_api (new in R3)
|
||||
('nova',
|
||||
'nova-manage --config-file /etc/nova/nova-dbsync.conf api_db sync'),
|
||||
# Migrate magnum (new in R5)
|
||||
('magnum',
|
||||
'magnum-db-manage --config-file /etc/magnum/magnum-dbsync.conf ' +
|
||||
'upgrade'),
|
||||
# Migrate ironic (new in R5)
|
||||
('ironic',
|
||||
'ironic-dbsync --config-file /etc/ironic/ironic-dbsync.conf ' +
|
||||
|
||||
Reference in New Issue
Block a user