nova-upgrade revision 4049
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import glob
import time
('DEFAULT', 'rabbit_durable_queues'): ('DEFAULT', 'amqp_durable_queues'),
('rpc_notifier2', 'topics'): ('DEFAULT', 'notification_topics'),
('DEFAULT', 'quota_injected_file_path_bytes'):
('DEFAULT', 'quota_injected_file_path_length'),
('DEFAULT', 'log_config'): ('DEFAULT', 'log_config_append'),
('DEFAULT', 'logfile'): ('DEFAULT', 'log_file'),
('DEFAULT', 'logdir'): ('DEFAULT', 'log_dir'),
('DEFAULT', 'cinder_catalog_info'): ('cinder', 'catalog_info'),
('DEFAULT', 'cinder_endpoint_template'): ('cinder', 'endpoint_template'),
('DEFAULT', 'os_region_name'): ('cinder', 'os_region_name'),
('DEFAULT', 'cinder_ca_certificates_file'):
('cinder', 'ca_certificates_file'),
('DEFAULT', 'cinder_http_retries'): ('cinder', 'http_retries'),
('DEFAULT', 'cinder_http_timeout'): ('cinder', 'http_timeout'),
('DEFAULT', 'cinder_api_insecure'): ('cinder', 'api_insecure'),
('DEFAULT', 'cinder_cross_az_attach'): ('cinder', 'cross_az_attach'),
('DEFAULT', 'db_backend'): ('database', 'backend'),
('DEFAULT', 'sql_connection'): ('database', 'connection'),
('DEFAULT', 'sql_connection'): ('database', 'connection'),
('sql', 'connection'): ('database', 'connection'),
('DEFAULT', 'sql_idle_timeout'): ('database', 'idle_timeout'),
('DATABASE', 'sql_idle_timeout'): ('database', 'idle_timeout'),
('sql', 'idle_timeout'): ('database', 'idle_timeout'),
('DEFAULT', 'sql_min_pool_size'): ('database', 'min_pool_size'),
('DATABASE', 'sql_min_pool_size'): ('database', 'min_pool_size'),
('DEFAULT', 'sql_max_pool_size'): ('database', 'max_pool_size'),
('DATABASE', 'sql_max_pool_size'): ('database', 'max_pool_size'),
('DEFAULT', 'sql_max_retries'): ('database', 'max_retries'),
('DATABASE', 'sql_max_retries'): ('database', 'max_retries'),
('DEFAULT', 'sql_retry_interval'): ('database', 'retry_interval'),
('DATABASE', 'reconnect_interval'): ('database', 'retry_interval'),
('DEFAULT', 'sql_max_overflow'): ('database', 'max_overflow'),
('DATABASE', 'sqlalchemy_max_overflow'): ('database', 'max_overflow'),
('DEFAULT', 'sql_connection_debug'): ('database', 'connection_debug'),
('DEFAULT', 'sql_connection_trace'): ('database', 'connection_trace'),
('DATABASE', 'sqlalchemy_pool_timeout'): ('database', 'pool_timeout'),
('DEFAULT', 'glance_host'): ('glance', 'host'),
('DEFAULT', 'glance_port'): ('glance', 'port'),
('DEFAULT', 'glance_protocol'): ('glance', 'protocol'),
('DEFAULT', 'glance_api_servers'): ('glance', 'api_servers'),
('DEFAULT', 'glance_api_insecure'): ('glance', 'api_insecure'),
('DEFAULT', 'glance_num_retries'): ('glance', 'num_retries'),
('DEFAULT', 'memcache_servers'):
('keystone_authtoken', 'memcached_servers'),
('DEFAULT', 'matchmaker_ringfile'): ('matchmaker_ring', 'ringfile'),
('DEFAULT', 'service_neutron_metadata_proxy'):
('neutron', 'service_metadata_proxy'),
('DEFAULT', 'neutron_metadata_proxy_shared_secret'):
('neutron', 'metadata_proxy_shared_secret'),
('DEFAULT', 'neutron_url'): ('neutron', 'url'),
('DEFAULT', 'neutron_url_timeout'): ('neutron', 'url_timeout'),
('DEFAULT', 'neutron_admin_username'): ('neutron', 'admin_username'),
('DEFAULT', 'neutron_admin_password'): ('neutron', 'admin_password'),
('DEFAULT', 'neutron_admin_tenant_id'): ('neutron', 'admin_tenant_id'),
('DEFAULT', 'neutron_admin_tenant_name'): ('neutron', 'admin_tenant_name'),
('DEFAULT', 'neutron_region_name'): ('neutron', 'region_name'),
('DEFAULT', 'neutron_admin_auth_url'): ('neutron', 'admin_auth_url'),
('DEFAULT', 'neutron_api_insecure'): ('neutron', 'api_insecure'),
('DEFAULT', 'neutron_auth_strategy'): ('neutron', 'auth_strategy'),
('DEFAULT', 'neutron_ovs_bridge'): ('neutron', 'ovs_bridge'),
('DEFAULT', 'neutron_extension_sync_interval'):
('neutron', 'extension_sync_interval'),
('DEFAULT', 'neutron_ca_certificates_file'):
('neutron', 'ca_certificates_file'),
('DEFAULT', 'spicehtml5proxy_host'): ('spice', 'html5proxy_host'),
('DEFAULT', 'spicehtml5proxy_port'): ('spice', 'html5proxy_port'),
# No longer referenced by the service
}
""" look for deprecated variables and, if found, convert it to the new
"""
print "Removing from configuration"
else:
""" Convert MySQL tables to use utf8
"""
try:
break
# mysql is not ready. sleep for 2 more seconds
time.sleep(2)
else:
print "Unable to connect to MySQL: %s" % err
print ("Please verify MySQL is properly configured and online "
"before using svcadm(1M) to clear this service.")
if res:
"CHARACTER SET 'utf8', COLLATE 'utf8_general_ci'"
db.close()
""" Copy over all uncommented options from the old configuration file. In
"""
# open the previous version
# open the new version
try:
if err.errno == errno.ENOENT:
# The upgrade did not deliver a .new file so, return
return
else:
print "\nupdating %s" % old_file
# It's possible that nova.conf has database.connection commented out (to
# use the default value). If it is, and none of other deprecated values
# are set, manually set database.connection in the new conf file.
options = [
('database', 'sql_connection'),
('sql', 'connection'),
('database', 'connection'),
('DEFAULT', 'sql_connection')
]
else:
state_path = '/var/lib/nova'
else:
sqlite_db = 'nova.sqlite'
# walk every single section for uncommented options
# DEFAULT items show up in every section so remove them
if section != 'DEFAULT':
else:
# keep a copy of the old value
# option is deprecated so continue
continue
if section != 'DEFAULT':
# print to the log when a value for the same section.key is
# changing to a new value
try:
print "Changing [%s] %s:\n- %s\n+ %s" % \
print
# the new configuration file does not have this option set so
# just continue
# Only copy the old value to the new conf file if the entry doesn't
# exist or if it contains '%SERVICE'
# copy the old conf file to a backup
# copy the new conf file in place
# pull out the current version of config/upgrade-id
# extract the openstack-upgrade-id from the pkg
# No need to upgrade
# look for any .new files
# the versions are different, so perform an upgrade
# modify the configuration files
# In certain cases the database section does not exist and the
# default database chosen is sqlite.
if engine.url.username != '%SERVICE_USER%':
print "altered character set to utf8 in nova tables"
# update the current version
if __name__ == '__main__':
try:
print 'Unknown error: %s' % err
print