author | Devjani Ray <devjani.ray@oracle.com> |
Fri, 09 Sep 2016 16:49:47 -0400 | |
changeset 6875 | 6a49dce509b7 |
parent 6854 | 52081f923019 |
child 6876 | 81ad8e956766 |
permissions | -rw-r--r-- |
4049
150852e281c4
20816335 move the core OpenStack components to Python 2.7
Drew Fisher <drew.fisher@oracle.com>
parents:
3998
diff
changeset
|
1 |
#!/usr/bin/python2.7 |
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
2 |
|
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4287
diff
changeset
|
3 |
# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. |
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
4 |
# |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
5 |
# Licensed under the Apache License, Version 2.0 (the "License"); you may |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
6 |
# not use this file except in compliance with the License. You may obtain |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
7 |
# a copy of the License at |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
8 |
# |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
9 |
# http://www.apache.org/licenses/LICENSE-2.0 |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
10 |
# |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
11 |
# Unless required by applicable law or agreed to in writing, software |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
12 |
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
13 |
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
14 |
# License for the specific language governing permissions and limitations |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
15 |
# under the License. |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
16 |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
17 |
import glob |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
18 |
import os |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
19 |
from subprocess import check_call, Popen, PIPE |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
20 |
import sys |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
21 |
import traceback |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
22 |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
23 |
import iniparse |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
24 |
import smf_include |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
25 |
import sqlalchemy |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
26 |
|
4287
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
27 |
from openstack_common import alter_mysql_tables, create_backups, modify_conf, \ |
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
28 |
move_conf |
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
29 |
|
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
30 |
NOVA_CONF_MAPPINGS = { |
6854
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
31 |
# Deprecated group/name for Liberty |
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4287
diff
changeset
|
32 |
('DEFAULT', 'network_device_mtu'): (None, None), |
6854
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
33 |
('DEFAULT', 'vnc_keymap'): ('vnc', 'keymap'), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
34 |
('DEFAULT', 'vnc_enabled'): ('vnc', 'enabled'), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
35 |
('DEFAULT', 'xvpvncproxy_base_url'): ('vnc', 'xvpvncproxy_base_url'), |
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4287
diff
changeset
|
36 |
('ironic', 'client_log_level'): (None, None), |
6854
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
37 |
('neutron', 'admin_username'): ('neutron', 'username'), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
38 |
('DEFAULT', 'ssl_ca_file'): ('ssl', 'ca_file'), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
39 |
('osapi_v21', 'enabled'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
40 |
('DEFAULT', 'novncproxy_base_url'): ('vnc', 'novncproxy_base_url'), |
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4287
diff
changeset
|
41 |
('neutron', 'admin_user_id'): (None, None), |
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4287
diff
changeset
|
42 |
('neutron', 'admin_tenant_id'): (None, None), |
6854
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
43 |
('DEFAULT', 'ssl_cert_file'): ('ssl', 'cert_file'), |
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4287
diff
changeset
|
44 |
('DEFAULT', 'log_format'): (None, None), |
6854
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
45 |
('DEFAULT', 'vncserver_proxyclient_address'): |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
46 |
('vnc', 'vncserver_proxyclient_address'), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
47 |
('osapi_v21', 'extensions_blacklist'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
48 |
('workarounds', 'destroy_after_evacuate'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
49 |
('neutron', 'admin_tenant_name'): ('neutron', 'tenant_name'), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
50 |
('DEFAULT', 'osapi_compute_ext_list'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
51 |
('DEFAULT', 'rpc_thread_pool_size'): |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
52 |
('DEFAULT', 'executor_thread_pool_size'), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
53 |
('DEFAULT', 'vncserver_listen'): ('vnc', 'vncserver_listen'), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
54 |
('neutron', 'admin_password'): ('neutron', 'password'), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
55 |
('DEFAULT', 'ssl_key_file'): ('ssl', 'key_file'), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
56 |
('neutron', 'admin_auth_url'): ('neutron', 'auth_url'), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
57 |
# Deprecated group/name for Mitaka |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
58 |
('DEFAULT', 'cert_manager'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
59 |
('DEFAULT', 'compute_available_monitors'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
60 |
('DEFAULT', 'compute_manager'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
61 |
('DEFAULT', 'compute_resources'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
62 |
('DEFAULT', 'compute_stats_class'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
63 |
('DEFAULT', 'console_manager'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
64 |
('DEFAULT', 'consoleauth_manager'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
65 |
('DEFAULT', 'db_driver'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
66 |
('DEFAULT', 'memcached_servers'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
67 |
('DEFAULT', 'metadata_manager'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
68 |
('DEFAULT', 'network_api_class'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
69 |
('DEFAULT', 'network_device_mtu'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
70 |
('DEFAULT', 'osapi_compute_ext_list'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
71 |
('DEFAULT', 'scheduler_manager'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
72 |
('DEFAULT', 'security_group_api'): (None, None), |
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4287
diff
changeset
|
73 |
('DEFAULT', 'share_dhcp_address'): (None, None), |
6854
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
74 |
('DEFAULT', 'use_syslog'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
75 |
('DEFAULT', 'vendordata_driver'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
76 |
('DEFAULT', 'volume_api_class'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
77 |
('cells', 'manager'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
78 |
('conductor', 'manager'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
79 |
('conductor', 'use_local'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
80 |
('glance', 'host'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
81 |
('glance', 'port'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
82 |
('glance', 'protocol'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
83 |
('hyperv', 'force_volumeutils_v1'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
84 |
('ironic', 'admin_auth_token'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
85 |
('ironic', 'api_version'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
86 |
('ironic', 'client_log_level'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
87 |
('libvirt', 'remove_unused_kernels'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
88 |
('osapi_v21', 'enabled'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
89 |
('osapi_v21', 'extensions_blacklist'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
90 |
('osapi_v21', 'extensions_whitelist'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
91 |
('osapi_v21', 'project_id_regex'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
92 |
('serial_console', 'listen'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
93 |
('workarounds', 'destroy_after_evacuate'): (None, None), |
6875
6a49dce509b7
24589107 nova-upgrade not mapping novncproxy_{port,base_url,host} correctly
Devjani Ray <devjani.ray@oracle.com>
parents:
6854
diff
changeset
|
94 |
# move noVNC proxy configuration from DEFAULT to the vnc group |
6a49dce509b7
24589107 nova-upgrade not mapping novncproxy_{port,base_url,host} correctly
Devjani Ray <devjani.ray@oracle.com>
parents:
6854
diff
changeset
|
95 |
('DEFAULT', 'novncproxy_port'): ('vnc', 'novncproxy_port'), |
6a49dce509b7
24589107 nova-upgrade not mapping novncproxy_{port,base_url,host} correctly
Devjani Ray <devjani.ray@oracle.com>
parents:
6854
diff
changeset
|
96 |
('DEFAULT', 'novncproxy_host'): ('vnc', 'novncproxy_host'), |
6854
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
97 |
# move entries from DEFAULT.nova.virt.solariszones.driver to its own |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
98 |
# section |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
99 |
('DEFAULT', 'boot_volume_type'): ('solariszones', 'boot_volume_type'), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
100 |
('DEFAULT', 'boot_volume_az'): ('solariszones', 'boot_volume_az'), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
101 |
('DEFAULT', 'glancecache_dirname'): |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
102 |
('solariszones', 'glancecache_dirname'), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
103 |
('DEFAULT', 'live_migration_cipher'): |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
104 |
('solariszones', 'live_migration_cipher'), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
105 |
('DEFAULT', 'solariszones_snapshots_directory'): |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
106 |
('solariszones', 'solariszones_snapshots_directory'), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
107 |
('DEFAULT', 'zones_suspend_path'): ('solariszones', 'zones_suspend_path'), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
108 |
('DEFAULT', 'solariszones_boot_options'): |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
109 |
('solariszones', 'solariszones_boot_options'), |
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
110 |
} |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
111 |
|
6854
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
112 |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
113 |
API_PASTE_MAPPING = { |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
114 |
('composite:osapi_compute', '/v1.1'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
115 |
('composite:osapi_compute', '/v3'): (None, None), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
116 |
} |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
117 |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
118 |
|
4287
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
119 |
NOVA_CONF_EXCEPTIONS = [ |
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
120 |
('DEFAULT', 'ec2_workers'), |
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
121 |
('DEFAULT', 'osapi_compute_workers'), |
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
122 |
('DEFAULT', 'metadata_workers'), |
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
123 |
('DEFAULT', 'lock_path'), |
6031
1aaf20a19738
PSARC/2016/251 OpenStack Neutron ML2 framework and OVS mechanism driver
Girish Moodalbail <Girish.Moodalbail@oracle.COM>
parents:
5722
diff
changeset
|
124 |
('DEFAULT', 'ovs_bridge'), |
4287
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
125 |
('conductor', 'workers'), |
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
126 |
('database', 'connection'), |
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
127 |
('keystone_authtoken', 'auth_uri'), |
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
128 |
('keystone_authtoken', 'signing_dir'), |
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
129 |
('keystone_authtoken', 'identity_uri'), |
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
130 |
('keystone_authtoken', 'admin_user'), |
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
131 |
('keystone_authtoken', 'admin_password'), |
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
132 |
('keystone_authtoken', 'admin_tenant_name'), |
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
133 |
('neutron', 'service_metadata_proxy'), |
6854
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
134 |
('neutron', 'username'), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
135 |
('neutron', 'password'), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
136 |
('neutron', 'tenant_name'), |
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
137 |
('neutron', 'auth_url'), |
6875
6a49dce509b7
24589107 nova-upgrade not mapping novncproxy_{port,base_url,host} correctly
Devjani Ray <devjani.ray@oracle.com>
parents:
6854
diff
changeset
|
138 |
('vnc', 'novncproxy_base_url'), |
6854
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
139 |
|
4287
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
140 |
] |
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
141 |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
142 |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
143 |
def start(): |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
144 |
# pull out the current version of config/upgrade-id |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
145 |
p = Popen(['/usr/bin/svcprop', '-p', 'config/upgrade-id', |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
146 |
os.environ['SMF_FMRI']], stdout=PIPE, stderr=PIPE) |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
147 |
curr_ver, _err = p.communicate() |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
148 |
curr_ver = curr_ver.strip() |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
149 |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
150 |
# extract the openstack-upgrade-id from the pkg |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
151 |
p = Popen(['/usr/bin/pkg', 'contents', '-H', '-t', 'set', '-o', 'value', |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
152 |
'-a', 'name=openstack.upgrade-id', |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
153 |
'pkg:/cloud/openstack/nova'], stdout=PIPE, stderr=PIPE) |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
154 |
pkg_ver, _err = p.communicate() |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
155 |
pkg_ver = pkg_ver.strip() |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
156 |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
157 |
if curr_ver == pkg_ver: |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
158 |
# No need to upgrade |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
159 |
sys.exit(smf_include.SMF_EXIT_OK) |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
160 |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
161 |
# look for any .new files |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
162 |
if glob.glob('/etc/nova/*.new'): |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
163 |
# the versions are different, so perform an upgrade |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
164 |
# modify the configuration files |
4287
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
165 |
|
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
166 |
# backup all the old configuration files |
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
167 |
create_backups('/etc/nova') |
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
168 |
|
6854
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
6031
diff
changeset
|
169 |
modify_conf('/etc/nova/api-paste.ini', API_PASTE_MAPPING) |
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
170 |
modify_conf('/etc/nova/logging.conf') |
4287
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
171 |
modify_conf('/etc/nova/nova.conf', NOVA_CONF_MAPPINGS, |
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
172 |
NOVA_CONF_EXCEPTIONS) |
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
173 |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
174 |
# update the current version |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
175 |
check_call(['/usr/sbin/svccfg', '-s', os.environ['SMF_FMRI'], 'setprop', |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
176 |
'config/upgrade-id', '=', pkg_ver]) |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
177 |
check_call(['/usr/sbin/svccfg', '-s', os.environ['SMF_FMRI'], 'refresh']) |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
178 |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
179 |
sys.exit(smf_include.SMF_EXIT_OK) |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
180 |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
181 |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
182 |
if __name__ == '__main__': |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
183 |
os.putenv('LC_ALL', 'C') |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
184 |
try: |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
185 |
smf_include.smf_main() |
4287
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
186 |
except RuntimeError: |
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4181
diff
changeset
|
187 |
sys.exit(smf_include.SMF_EXIT_ERR_FATAL) |
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
188 |
except Exception as err: |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
189 |
print 'Unknown error: %s' % err |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
190 |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
191 |
traceback.print_exc(file=sys.stdout) |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
192 |
sys.exit(smf_include.SMF_EXIT_ERR_FATAL) |