| author | Laszlo Peter <laszlo.peter@oracle.com> |
| Wed, 07 Sep 2016 14:48:41 -0700 | |
| changeset 6849 | f9a2279efa0d |
| parent 5722 | 255021c1e96c |
| 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:
4183
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:
4183
diff
changeset
|
28 |
move_conf |
|
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
29 |
|
|
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
30 |
|
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
31 |
CINDER_CONF_MAPPINGS = {
|
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
32 |
# Deprecated group/name |
|
6849
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
33 |
('DEFAULT', 'host'): ('BACKEND', 'backend_host'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
34 |
('DEFAULT', 'glusterfs_sparsed_volumes'):
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
35 |
('DEFAULT', 'nas_volume_prov_type'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
36 |
('DEFAULT', 'glusterfs_qcow2_volumes'):
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
37 |
('DEFAULT', 'nas_volume_prov_type'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
38 |
('DEFAULT', 'rpc_thread_pool_size'):
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
39 |
('DEFAULT', 'executor_thread_pool_size'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
40 |
('DEFAULT', 'netapp_volume_list'):
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
41 |
('DEFAULT', 'netapp_pool_name_search_pattern'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
42 |
('DEFAULT', 'netapp_storage_pools'):
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
43 |
('DEFAULT', 'netapp_pool_name_search_pattern'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
44 |
('DEFAULT', 'netapp_eseries_host_type'):
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
45 |
('DEFAULT', 'netapp_host_type'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
46 |
('DEFAULT', 'storage_vnx_pool_name'):
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
47 |
('DEFAULT', 'storage_vnx_pool_names'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
48 |
('DEFAULT', 'notification_driver'):
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
49 |
('oslo_messaging_notifications', 'driver'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
50 |
('DEFAULT', 'notification_topics'):
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
51 |
('oslo_messaging_notifications', 'topics'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
52 |
('DEFAULT', 'hp3par_api_url'): ('DEFAULT', 'hpe3par_api_url'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
53 |
('DEFAULT', 'hp3par_cpg'): ('DEFAULT', 'hp3par_cpg'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
54 |
('DEFAULT', 'hp3par_cpg_snap'): ('DEFAULT', 'hpe3par_cpg_snap'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
55 |
('DEFAULT', 'hp3par_debug'): ('DEFAULT', 'hpe3par_debug'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
56 |
('DEFAULT', 'hp3par_iscsi_chap_enabled'):
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
57 |
('DEFAULT', 'hpe3par_iscsi_chap_enabled'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
58 |
('DEFAULT', 'hp3par_debug'): ('DEFAULT', 'hpe3par_debug'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
59 |
('DEFAULT', 'hp3par_password'): ('DEFAULT', 'hpe3par_password'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
60 |
('DEFAULT', 'hp3par_snapshot_expiration'):
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
61 |
('DEFAULT', 'hpe3par_snapshot_expiration'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
62 |
('DEFAULT', 'hp3par_snapshot_retention'):
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
63 |
('DEFAULT', 'hpe3par_snapshot_retention'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
64 |
('DEFAULT', 'hp3par_username'): ('DEFAULT', 'hpe3par_username'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
65 |
('DEFAULT', 'hplefthand_api_url'): ('DEFAULT', 'hpelefthand_api_url'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
66 |
('DEFAULT', 'hplefthand_clustername'):
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
67 |
('DEFAULT', ' hpelefthand_clustername'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
68 |
('DEFAULT', 'hplefthand_debug'): ('DEFAULT', 'hpelefthand_debug'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
69 |
('DEFAULT', 'hplefthand_iscsi_chap_enabled'):
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
70 |
('DEFAULT', ' hpelefthand_iscsi_chap_enabled'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
71 |
('DEFAULT', 'hplefthand_password'): ('DEFAULT', 'hpelefthand_password'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
72 |
('DEFAULT', 'hplefthand_username'): ('DEFAULT', 'hpelefthand_username'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
73 |
('DEFAULT', 'hpxp_async_copy_check_interval'):
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
74 |
('DEFAULT', 'hpexp_async_copy_check_interval'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
75 |
('DEFAULT', 'hpxp_compute_target_ports'):
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
76 |
('DEFAULT', 'hpexp_compute_target_ports'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
77 |
('DEFAULT', 'hpxp_copy_check_interval'):
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
78 |
('DEFAULT', 'hpexp_copy_check_interval'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
79 |
('DEFAULT', 'hpxp_copy_speed'): ('DEFAULT', 'hpexp_copy_speed'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
80 |
('DEFAULT', 'hpxp_default_copy_method'):
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
81 |
('DEFAULT', 'hpexp_default_copy_method'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
82 |
('DEFAULT', 'hpxp_group_request'): ('DEFAULT', 'hpexp_group_request'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
83 |
('DEFAULT', 'hpxp_horcm_add_conf'): ('DEFAULT', 'hpexp_horcm_add_conf'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
84 |
('DEFAULT', 'hpxp_horcm_name_only_discovery'):
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
85 |
('DEFAULT', 'hpexp_horcm_name_only_discovery'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
86 |
('DEFAULT', 'hpxp_horcm_numbers'): ('DEFAULT', 'hpexp_horcm_numbers'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
87 |
('DEFAULT', 'hpxp_horcm_resource_name'):
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
88 |
('DEFAULT', 'hpexp_horcm_resource_name'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
89 |
('DEFAULT', 'hpxp_horcm_user'): ('DEFAULT', 'hpexp_horcm_user'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
90 |
('DEFAULT', 'hpxp_ldev_range'): ('DEFAULT', 'hpexp_ldev_range'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
91 |
('DEFAULT', 'hpxp_pool'): ('DEFAULT', 'hpexp_pool'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
92 |
('DEFAULT', 'hpxp_storage_cli'): ('DEFAULT', 'hpexp_storage_cli'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
93 |
('DEFAULT', 'hpxp_storage_id'): ('DEFAULT', 'hpexp_storage_id'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
94 |
('DEFAULT', 'hpxp_target_ports'): ('DEFAULT', 'hpexp_target_ports'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
95 |
('DEFAULT', 'hpxp_thin_pool'): ('DEFAULT', 'hpexp_thin_pool'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
96 |
('DEFAULT', 'hpxp_zoning_request'): ('DEFAULT', 'hpexp_zoning_request'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
97 |
('profiler', 'profiler_enabled'): ('profiler', 'enabled'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
98 |
('DEFAULT', 'enable_v2_api'): (None, None),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
99 |
('DEFAULT', 'use_syslog_rfc_format'): (None, None),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
100 |
('DEFAULT', 'use_syslog'): (None, None),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
101 |
('hyperv', 'force_volumeutils_v1'): (None, None),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
102 |
('DEFAULT', 'rpc_zmq_port'): (None, None),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
103 |
('DEFAULT', 'matchmaker_heartbeat_freq'): (None, None),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
104 |
('DEFAULT', 'matchmaker_heartbeat_ttl'): (None, None),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
105 |
('DEFAULT', 'request_timeout'): ('DEFAULT', 'violin_request_timeout'),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
106 |
('DEFAULT', 'gateway_mga'): (None, None),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
107 |
('DEFAULT', 'gateway_mgb'): (None, None),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
108 |
('DEFAULT', 'use_igroups'): (None, None),
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
109 |
|
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5722
diff
changeset
|
110 |
|
|
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
111 |
} |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
112 |
|
|
4287
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
113 |
CINDER_CONF_EXCEPTIONS = [ |
|
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
114 |
('DEFAULT', 'osapi_volume_workers'),
|
|
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
115 |
('DEFAULT', 'auth_strategy'),
|
|
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
116 |
('DEFAULT', 'san_is_local'),
|
|
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
117 |
('DEFAULT', 'volume_driver'),
|
|
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
118 |
('database', 'connection'),
|
|
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
119 |
('keystone_authtoken', 'auth_uri'),
|
|
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
120 |
('keystone_authtoken', 'identity_uri'),
|
|
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
121 |
('keystone_authtoken', 'admin_user'),
|
|
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
122 |
('keystone_authtoken', 'admin_password'),
|
|
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
123 |
('keystone_authtoken', 'admin_tenant_name'),
|
|
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
124 |
('keystone_authtoken', 'signing_dir'),
|
|
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
125 |
] |
|
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
126 |
|
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
127 |
|
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
128 |
def start(): |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
129 |
# 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
|
130 |
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
|
131 |
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
|
132 |
curr_ver, _err = p.communicate() |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
133 |
curr_ver = curr_ver.strip() |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
134 |
|
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
135 |
# 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
|
136 |
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
|
137 |
'-a', 'name=openstack.upgrade-id', |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
138 |
'pkg:/cloud/openstack/cinder'], stdout=PIPE, stderr=PIPE) |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
139 |
pkg_ver, _err = p.communicate() |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
140 |
pkg_ver = pkg_ver.strip() |
|
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 |
if curr_ver == pkg_ver: |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
143 |
# No need to upgrade |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
144 |
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
|
145 |
|
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
146 |
# look for any .new files |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
147 |
if glob.glob('/etc/cinder/*.new'):
|
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
148 |
# 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
|
149 |
# modify the configuration files |
|
4287
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
150 |
|
|
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
151 |
# backup all the old configuration files |
|
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
152 |
create_backups('/etc/cinder')
|
|
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
153 |
|
|
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
154 |
modify_conf('/etc/cinder/api-paste.ini')
|
|
4287
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
155 |
|
|
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
156 |
modify_conf('/etc/cinder/cinder.conf', CINDER_CONF_MAPPINGS,
|
|
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
157 |
CINDER_CONF_EXCEPTIONS) |
|
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
158 |
|
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
159 |
config = iniparse.RawConfigParser() |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
160 |
config.read('/etc/cinder/cinder.conf')
|
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
161 |
# In certain cases the database section does not exist and the |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
162 |
# default database chosen is sqlite. |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
163 |
if config.has_section('database'):
|
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
164 |
db_connection = config.get('database', 'connection')
|
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
165 |
|
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
166 |
if db_connection.startswith('mysql'):
|
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
167 |
engine = sqlalchemy.create_engine(db_connection) |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
168 |
if engine.url.username != '%SERVICE_USER%': |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
169 |
alter_mysql_tables(engine) |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
170 |
print "altered character set to utf8 in cinder tables" |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
171 |
|
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
172 |
# update the current version |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
173 |
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
|
174 |
'config/upgrade-id', '=', pkg_ver]) |
|
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'], 'refresh']) |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
176 |
|
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
177 |
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
|
178 |
|
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
179 |
|
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
180 |
if __name__ == '__main__': |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
181 |
os.putenv('LC_ALL', 'C')
|
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
182 |
try: |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
183 |
smf_include.smf_main() |
|
4287
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
184 |
except RuntimeError: |
|
aba3ed31b37a
PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
4183
diff
changeset
|
185 |
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
|
186 |
except Exception as err: |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
187 |
print 'Unknown error: %s' % err |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
188 |
|
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
189 |
traceback.print_exc(file=sys.stdout) |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
190 |
sys.exit(smf_include.SMF_EXIT_ERR_FATAL) |