components/openstack/glance/files/glance-upgrade
author Devjani Ray <devjani.ray@oracle.com>
Fri, 20 May 2016 17:42:29 -0400
branchs11u3-sru
changeset 6035 c9748fcc32de
parent 4625 18adb92d4193
permissions -rw-r--r--
PSARC 2015/535 OpenStack service updates for Kilo PSARC 2015/458 aioeventlet - asyncio event loop scheduling callbacks in eventlet PSARC 2015/460 msgpack - C/Python bindings for MessagePack (de)serializer data PSARC 2015/466 openstackclient - OpenStack Command-line Client PSARC 2015/467 oslo.versionedobjects - Oslo Versioned Objects library PSARC 2015/468 pint - A physical quantities module PSARC 2015/469 pysaml2 - A pure Python implementation of SAML2 PSARC 2015/471 semantic_version - A library implementing the 'SemVer' scheme PSARC 2015/472 testresources - PyUnit extension for managing expensive test resources PSARC 2015/473 testscenarios - Extensions to Python unittest to support scenarios PSARC 2015/474 trollius - Port of the Tulip project (asyncio module, PEP 3156) on Python 2 PSARC 2015/475 urllib3 - HTTP library with thread-safe connection pooling, file post, and more PSARC 2015/520 oslo.concurrency - Oslo Concurrency library PSARC 2015/521 oslo.log - Oslo Logging Configuration library PSARC 2015/529 oslo.policy - Oslo Policy library PSARC 2015/530 psutil - Python system and process utilities PSARC 2015/538 fixtures - Python module to support reusable state for writing clean tests PSARC 2015/539 sqlparse - An SQL parser module for Python PSARC 2016/017 extras - Useful extra utilities for Python PSARC 2016/018 linecache2 - Port of the standard linecache module PSARC 2016/019 python-mimeparse - Basic functions for parsing mime-types PSARC 2016/020 testtools - Extensions to the Python unit testing framework PSARC 2016/021 traceback2 - Port of the standard traceback module PSARC 2016/014 OpenStack Cinder NFS driver for Solaris PSARC/2016/010 cloudbase-init: Portable cloud image initialization PSARC/2016/130 Solaris OpenStack Puppet Extensions PSARC/2016/172 Making OpenStack Nova's image cache sharable PSARC/2016/001 OpenStack Puppet Modules PSARC/2016/016 Rename/Refactor Puppet and Puppet Module Packages PSARC/2015/368 Common Puppet Modules PSARC 2015/357 OpenStack Nova support for kernel zone suspend/resume 22384068 OpenStack service updates for Kilo (Umbrella) 23205460 Fix for 23192887 breaks Juno to Kilo upgrade with instances and floating IPs 23192887 Upgrade from Juno to Kilo fails (neutron-upgrade) due to typo 22878181 Neutron database tables not upgraded properly from Juno to Kilo schema 22935140 Kilo upgrade adds deprecated settings for rabbit and qpid 22935039 Kilo upgrade conf file migration errors 23027746 Metadata access broken with too many networks 23040216 extra zfssa_ prefix in the zfssa_iscsi.pp backend manifest 22992961 Update saz-memcached to 2.8.1 22992956 Update puppetlabs-stdlib to 4.11.0 22992951 Update puppetlabs-ntp to 4.1.2 22992946 Update puppetlabs-mysql to 3.6.2 22992926 Update puppetlabs-apache to 1.8.1 22992933 Update puppetlabs-inifile to 1.4.3 22999085 apache puppet module doesn't support ssl on Solaris 22985076 neutron_network provider always sets --shared on new networks 22813139 add zfssa cinder puppet modules 22902222 add NFS cinder puppet modules 22918553 update vpnaas and l3 agent puppet modules 22902853 Neutron/VPNaaS needs a workaround for 22902761 22827759 nova-compute still trips over itself when rad:local restarts 20990774 nova image cache bloats clone archives to godzilla size 22750945 Revert resize same host branded zones results in error status 18733958 nova tried to create x86 instance on SPARC 22220227 failure to apply zonecfg in attach_volume can leave debris in zonecfg 22935198 puppetlabs-mysql should define basedir in params.pp 22911268 Update puppetlabs-rabbitmq to 5.3.1 22852949 problem in PYTHON-MOD/DJANGO 22852962 problem in PYTHON-MOD/DJANGO 22819808 target_provision_state should not be set to AVAILABLE 22491714 Request to integrate OpenStack Puppet modules 22713569 nova-conductor doesn't handle RPC timeout during live-migration well 22695176 Miscellaneous package cleanup for Kilo 22694904 Some of the OpenStack patches can be cleaned up 22694680 Dependencies in several OpenStack service packages can be improved 22694592 Several configuration files should be more aligned with the upstream 22575858 problem in SERVICE/SWIFT 22047789 puppet package name and dependencies are confusing 22664785 Puppet module files should be owned by puppet 21460057 Add cloudbase-init to Solaris 21974208 The Python module msgpack should be added to Userland 22010630 The Python trollius module should be added to Userland 22011755 The Python module pint should be added to Userland 22012256 The Python aioeventlet module should be added to Userland 22012282 The Python oslo.versionedobjects module should be added to Userland 22012317 The Python semantic_version module should be added to Userland 22012321 The Python testresources module should be added to Userland 22012329 The Python testscenarios module should be added to Userland 22012336 The Python urllib3 module should be added to Userland 22012343 The Python openstackclient module should be added to Userland 22299389 The Python oslo.concurrency module should be added to Userland 22299409 The Python oslo.log module should be added to Userland 22299418 The Python oslo.policy module should be added to Userland 22299469 The Python psutil module should be added to Userland 22337793 The Python sqlparse module should be added to Userland 22338325 The Python fixtures module should be added to Userland 22535728 The Python testtools module should be added to Userland 22535739 The Python extras module should be added to Userland 22535748 The Python linecache2 module should be added to Userland 22535753 The Python traceback2 module should be added to Userland 22535760 The Python python-mimeparse module should be added to Userland 18961001 Image filtering does not function as expected 21678935 NFS for Cinder in Solaris OpenStack 22548630 derived manifest should not enforce presence of global when installing from UAR 22629795 problem in SERVICE/KEYSTONE 22151922 zones_suspend_path needs update based on post-PSARC discussion 21660603 passlib dependency needs to be added to Nova 22188197 puppetlabs-rabbitmq needs a patch to handle rabbitmqadmin 21756542 problem in SERVICE/SWIFT 21978756 addrconf addresses must be created for stateless and slaac Neutron subnets 21978743 ndpd.conf entries are incorrectly formatted for IPv6 subnets 21919000 neutron-dhcp-agent and neutron-server have timing issues 21918991 database times out when attempting various actions 21682493 Neutron fails due to mysql transaction locks when creating multiple instances 22024767 Remove annoying "Arguments dropped when creating context" logging 21691386 Request to integrate common puppet modules into Userland 21630128 Neutron needs to support updating subnet DNS configuration 21761279 Driver erroneously includes trailing space in zone.install() arguments 21438537 After update, openstack/keystone/keystone-token-flush not running 21630538 Nova driver should support suspend/resume 21542088 VM's display_name is used instead of hostname to set the hostname for VM 19774239 Nova should support setting the Admin Password 21439855 Console SMF instance remains after nova instance is deleted 21348400 Issues encountered via unit testing 21341088 Parsing manifest/profiles fails if multiple criteria present 21303465 edit image window has no ZFS disk format option 21091598 ceilometerclient's Makefile needs to point to its own PROJECT_URL 21164329 saharaclient COMPONENT_BUGDB points to the wrong subcomponent 20431382 keystone should include a periodic token cleanup job 21299660 enable no-gateway check box now that we support it 21135855 Enable gateway-less external networks 20230409 remove _get_zone_auto_install_state from driver.py 21022556 optional dependencies on rabbitmq need work in OpenStack services 22568587 heat denial of service through template-validate 22157556 RabbitMQ Warning: Mochiweb enabled and Erlang version 17
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4625
18adb92d4193 20816335 move the core OpenStack components to Python 2.7
Drew Fisher <drew.fisher@oracle.com>
parents: 4314
diff changeset
     1
#!/usr/bin/python2.7
4072
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     2
6035
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
     3
# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
4072
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     4
#
db0cec748ec0 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
db0cec748ec0 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
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     7
#    a copy of the License at
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     8
#
db0cec748ec0 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
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    10
#
db0cec748ec0 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
db0cec748ec0 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
db0cec748ec0 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
db0cec748ec0 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
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    15
#    under the License.
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    16
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    17
import glob
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    18
import os
db0cec748ec0 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
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    20
import sys
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    21
import traceback
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    22
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    23
import iniparse
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    24
import smf_include
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    25
import sqlalchemy
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    26
4314
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    27
from openstack_common import alter_mysql_tables, create_backups, modify_conf
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    28
4072
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    29
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    30
GLANCE_API_MAPPINGS = {
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    31
    # Deprecated group/name
6035
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    32
    ('DEFAULT', 'container_formats'): ('image_format', 'container_formats'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    33
    ('DEFAULT', 'disk_formats'): ('image_format', 'disk_formats'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    34
    ('DEFAULT', 'matchmaker_ringfile'): ('matchmaker_ring', 'ringfile'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    35
    ('DEFAULT', 'rabbit_durable_queues'): ('oslo_messaging_qpid',
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    36
                                           'amqp_durable_queues'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    37
    ('DEFAULT', 'qpid_hostname'): ('oslo_messaging_qpid', 'qpid_hostname'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    38
    ('DEFAULT', 'qpid_port'): ('oslo_messaging_qpid', 'qpid_port'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    39
    ('DEFAULT', 'qpid_username'): ('oslo_messaging_qpid', 'qpid_username'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    40
    ('DEFAULT', 'qpid_password'): ('oslo_messaging_qpid', 'qpid_password'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    41
    ('DEFAULT', 'qpid_sasl_mechanisms'): ('oslo_messaging_qpid',
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    42
                                          'qpid_sasl_mechanisms'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    43
    ('DEFAULT', 'qpid_heartbeat'): ('oslo_messaging_qpid', 'qpid_heartbeat'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    44
    ('DEFAULT', 'qpid_protocol'): ('oslo_messaging_qpid', 'qpid_protocol'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    45
    ('DEFAULT', 'qpid_tcp_nodelay'): ('oslo_messaging_qpid',
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    46
                                      'qpid_tcp_nodelay'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    47
    ('DEFAULT', 'rabbit_host'): ('oslo_messaging_rabbit', 'rabbit_host'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    48
    ('DEFAULT', 'rabbit_port'): ('oslo_messaging_rabbit', 'rabbit_port'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    49
    ('DEFAULT', 'rabbit_use_ssl'): ('oslo_messaging_rabbit', 'rabbit_use_ssl'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    50
    ('DEFAULT', 'rabbit_userid'): ('oslo_messaging_rabbit', 'rabbit_userid'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    51
    ('DEFAULT', 'rabbit_password'): ('oslo_messaging_rabbit',
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    52
                                     'rabbit_password'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    53
    ('DEFAULT', 'rabbit_virtual_host'): ('oslo_messaging_rabbit',
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    54
                                         'rabbit_virtual_host'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    55
    ('task', 'eventlet_executor_pool_size'):
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    56
        ('taskflow_executor', 'max_workers'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    57
    ('DEFAULT', 'log-format'): (None, None),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    58
    ('DEFAULT', 'log_format'): (None, None),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    59
    ('DEFAULT', 'use-syslog'): (None, None),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    60
    ('glance_store', 'vmware_datacenter_path'): (None, None),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    61
    ('glance_store', 'vmware_datastore_name'): (None, None),
4072
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    62
}
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    63
4314
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    64
GLANCE_API_EXCEPTIONS = [
6035
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    65
    ('DEFAULT', 'admin_tenant_name'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    66
    ('DEFAULT', 'admin_user'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    67
    ('DEFAULT', 'admin_password'),
4314
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    68
    ('DEFAULT', 'bind_host'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    69
    ('DEFAULT', 'bind_port'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    70
    ('DEFAULT', 'log_file'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    71
    ('DEFAULT', 'backlog'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    72
    ('DEFAULT', 'workers'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    73
    ('DEFAULT', 'registry_host'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    74
    ('DEFAULT', 'registry_port'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    75
    ('DEFAULT', 'registry_client_protocol'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    76
    ('DEFAULT', 'delayed_delete'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    77
    ('DEFAULT', 'scrub_time'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    78
    ('DEFAULT', 'scrubber_datadir'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    79
    ('DEFAULT', 'image_cache_dir'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    80
    ('database', 'connection'),
6035
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
    81
    ('paste_deploy', 'flavor'),
4314
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    82
    ('keystone_authtoken', 'auth_uri'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    83
    ('keystone_authtoken', 'identity_uri'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    84
    ('keystone_authtoken', 'admin_tenant_name'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    85
    ('keystone_authtoken', 'admin_user'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    86
    ('keystone_authtoken', 'admin_password'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    87
    ('keystone_authtoken', 'revocation_cache_time'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    88
    ('glance_store', 'filesystem_store_datadir'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    89
    ('glance_store', 'swift_store_auth_version'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    90
    ('glance_store', 'swift_store_auth_address'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    91
    ('glance_store', 'swift_store_user'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    92
    ('glance_store', 'swift_store_key'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    93
    ('glance_store', 'swift_store_container'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    94
    ('glance_store', 'swift_store_create_container_on_put'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    95
    ('glance_store', 'swift_store_large_object_size'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    96
    ('glance_store', 'swift_store_large_object_chunk_size'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    97
    ('glance_store', 's3_store_host'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    98
    ('glance_store', 's3_store_create_bucket_on_put'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
    99
    ('glance_store', 'sheepdog_store_address'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   100
    ('glance_store', 'sheepdog_store_port'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   101
    ('glance_store', 'sheepdog_store_chunk_size'),
6035
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   102
    ('oslo_messaging_rabbit', 'rabbit_host'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   103
    ('oslo_messaging_rabbit', 'rabbit_port'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   104
    ('oslo_messaging_rabbit', 'rabbit_use_ssl'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   105
    ('oslo_messaging_rabbit', 'rabbit_userid'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   106
    ('oslo_messaging_rabbit', 'rabbit_password'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   107
    ('oslo_messaging_rabbit', 'rabbit_virtual_host'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   108
    ('oslo_messaging_rabbit', 'rabbit_notification_exchange'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   109
    ('oslo_messaging_rabbit', 'rabbit_notification_topic'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   110
    ('oslo_messaging_rabbit', 'rabbit_durable_queues'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   111
    ('oslo_messaging_qpid', 'qpid_notification_exchange'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   112
    ('oslo_messaging_qpid', 'qpid_notification_topic'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   113
    ('oslo_messaging_qpid', 'qpid_hostname'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   114
    ('oslo_messaging_qpid', 'qpid_port'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   115
    ('oslo_messaging_qpid', 'qpid_usernamd'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   116
    ('oslo_messaging_qpid', 'qpid_password'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   117
    ('oslo_messaging_qpid', 'qpid_sasl_mechanisms'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   118
    ('oslo_messaging_qpid', 'qpid_reconnect_timeout'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   119
    ('oslo_messaging_qpid', 'qpid_reconnect_limit'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   120
    ('oslo_messaging_qpid', 'qpid_reconnect_interval_min'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   121
    ('oslo_messaging_qpid', 'qpid_reconnect_interval_max'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   122
    ('oslo_messaging_qpid', 'qpid_reconnect_interval'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   123
    ('oslo_messaging_qpid', 'qpid_heartbeat'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   124
    ('oslo_messaging_qpid', 'qpid_protocol'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   125
    ('oslo_messaging_qpid', 'qpid_tcp_nodelay'),
4314
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   126
]
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   127
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   128
GLANCE_CACHE_EXCEPTIONS = [
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   129
    ('DEFAULT', 'log_file'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   130
    ('DEFAULT', 'image_cache_dir'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   131
    ('DEFAULT', 'image_cache_stall_time'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   132
    ('DEFAULT', 'image_cache_max_size'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   133
    ('DEFAULT', 'registry_host'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   134
    ('DEFAULT', 'registry_port'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   135
    ('DEFAULT', 'auth_url'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   136
    ('DEFAULT', 'admin_tenant_name'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   137
    ('DEFAULT', 'admin_user'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   138
    ('DEFAULT', 'admin_password'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   139
    ('DEFAULT', 'filesystem_store_datadir'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   140
]
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   141
4072
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   142
GLANCE_REGISTRY_MAPPINGS = {
6035
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   143
    # Deprecate group/name
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   144
    ('DEFAULT', 'rabbit_durable_queues'): ('oslo_messaging_qpid',
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   145
                                           'rabbit_durable_queues'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   146
    ('DEFAULT', 'qpid_hostname'): ('oslo_messaging_qpid', 'qpid_hostname'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   147
    ('DEFAULT', 'qpid_port'): ('oslo_messaging_qpid', 'qpid_port'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   148
    ('DEFAULT', 'qpid_username'): ('oslo_messaging_qpid', 'qpid_username'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   149
    ('DEFAULT', 'qpid_password'): ('oslo_messaging_qpid', 'qpid_password'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   150
    ('DEFAULT', 'qpid_sasl_mechanisms'): ('oslo_messaging_qpid',
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   151
                                          'qpid_sasl_mechanisms'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   152
    ('DEFAULT', 'qpid_heartbeat'): ('oslo_messaging_qpid', 'qpid_heartbeat'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   153
    ('DEFAULT', 'qpid_protocol'): ('oslo_messaging_qpid', 'qpid_protocol'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   154
    ('DEFAULT', 'qpid_tcp_nodelay'): ('oslo_messaging_qpid',
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   155
                                      'qpid_tcp_nodelay'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   156
    ('DEFAULT', 'rabbit_host'): ('oslo_messaging_rabbit', 'rabbit_host'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   157
    ('DEFAULT', 'rabbit_port'): ('oslo_messaging_rabbit', 'rabbit_port'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   158
    ('DEFAULT', 'rabbit_use_ssl'): ('oslo_messaging_rabbit', 'rabbit_use_ssl'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   159
    ('DEFAULT', 'rabbit_userid'): ('oslo_messaging_rabbit', 'rabbit_userid'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   160
    ('DEFAULT', 'rabbit_password'): ('oslo_messaging_rabbit',
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   161
                                     'rabbit_password'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   162
    ('DEFAULT', 'rabbit_virtual_host'): ('oslo_messaging_rabbit',
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   163
                                         'rabbit_virtual_host'),
4072
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   164
}
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   165
4314
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   166
GLANCE_REGISTRY_EXCEPTIONS = [
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   167
    ('DEFAULT', 'bind_host'),
6035
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   168
    ('DEFAULT', 'bind_port'),
4314
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   169
    ('DEFAULT', 'log_file'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   170
    ('DEFAULT', 'backlog'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   171
    ('DEFAULT', 'workers'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   172
    ('DEFAULT', 'limit_param_default'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   173
    ('database', 'connection'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   174
    ('keystone_authtoken', 'auth_uri'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   175
    ('keystone_authtoken', 'identity_uri'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   176
    ('keystone_authtoken', 'admin_tenant_name'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   177
    ('keystone_authtoken', 'admin_user'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   178
    ('keystone_authtoken', 'admin_password'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   179
    ('keystone_authtoken', 'signing_dir'),
6035
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   180
    ('oslo_messaging_rabbit', 'rabbit_host'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   181
    ('oslo_messaging_rabbit', 'rabbit_port'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   182
    ('oslo_messaging_rabbit', 'rabbit_use_ssl'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   183
    ('oslo_messaging_rabbit', 'rabbit_userid'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   184
    ('oslo_messaging_rabbit', 'rabbit_password'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   185
    ('oslo_messaging_rabbit', 'rabbit_virtual_host'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   186
    ('oslo_messaging_rabbit', 'rabbit_notification_exchange'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   187
    ('oslo_messaging_rabbit', 'rabbit_notification_topic'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   188
    ('oslo_messaging_rabbit', 'rabbit_durable_queues'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   189
    ('oslo_messaging_qpid', 'qpid_notification_exchange'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   190
    ('oslo_messaging_qpid', 'qpid_notification_topic'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   191
    ('oslo_messaging_qpid', 'qpid_hostname'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   192
    ('oslo_messaging_qpid', 'qpid_port'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   193
    ('oslo_messaging_qpid', 'qpid_usernamd'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   194
    ('oslo_messaging_qpid', 'qpid_password'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   195
    ('oslo_messaging_qpid', 'qpid_sasl_mechanisms'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   196
    ('oslo_messaging_qpid', 'qpid_reconnect_timeout'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   197
    ('oslo_messaging_qpid', 'qpid_reconnect_limit'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   198
    ('oslo_messaging_qpid', 'qpid_reconnect_interval_min'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   199
    ('oslo_messaging_qpid', 'qpid_reconnect_interval_max'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   200
    ('oslo_messaging_qpid', 'qpid_reconnect_interval'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   201
    ('oslo_messaging_qpid', 'qpid_heartbeat'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   202
    ('oslo_messaging_qpid', 'qpid_protocol'),
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   203
    ('oslo_messaging_qpid', 'qpid_tcp_nodelay'),
4314
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   204
    ('paste_deploy', 'flavor'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   205
]
4072
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   206
6035
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   207
# TODO: Add mappings?
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   208
# GLANCE_SCRUBBER_MAPPINGS
4072
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   209
4314
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   210
GLANCE_SCRUBBER_EXCEPTIONS = [
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   211
    ('DEFAULT', 'log_file'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   212
    ('DEFAULT', 'wakeup_time'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   213
    ('DEFAULT', 'scrubber_datadir'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   214
    ('DEFAULT', 'cleanup_scrubber'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   215
    ('DEFAULT', 'cleanup_scrubber_time'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   216
    ('DEFAULT', 'registry_host'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   217
    ('DEFAULT', 'registry_port'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   218
    ('DEFAULT', 'auth_url'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   219
    ('DEFAULT', 'admin_tenant_name'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   220
    ('DEFAULT', 'admin_user'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   221
    ('DEFAULT', 'admin_password'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   222
    ('database', 'connection'),
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   223
]
4072
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   224
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   225
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   226
def start():
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   227
    # pull out the current version of config/upgrade-id
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   228
    p = Popen(['/usr/bin/svcprop', '-p', 'config/upgrade-id',
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   229
               os.environ['SMF_FMRI']], stdout=PIPE, stderr=PIPE)
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   230
    curr_ver, _err = p.communicate()
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   231
    curr_ver = curr_ver.strip()
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   232
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   233
    # extract the openstack-upgrade-id from the pkg
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   234
    p = Popen(['/usr/bin/pkg', 'contents', '-H', '-t', 'set', '-o', 'value',
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   235
               '-a', 'name=openstack.upgrade-id',
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   236
               'pkg:/cloud/openstack/glance'], stdout=PIPE, stderr=PIPE)
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   237
    pkg_ver, _err = p.communicate()
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   238
    pkg_ver = pkg_ver.strip()
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   239
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   240
    if curr_ver == pkg_ver:
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   241
        # No need to upgrade
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   242
        sys.exit(smf_include.SMF_EXIT_OK)
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   243
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   244
    # look for any .new files
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   245
    if glob.glob('/etc/glance/*.new'):
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   246
        # the versions are different, so perform an upgrade
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   247
        # modify the configuration files
4314
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   248
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   249
        # backup all the old configuration files
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   250
        create_backups('/etc/glance')
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   251
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   252
        modify_conf('/etc/glance/glance-api.conf', GLANCE_API_MAPPINGS,
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   253
                    GLANCE_API_EXCEPTIONS)
4072
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   254
        modify_conf('/etc/glance/glance-api-paste.ini')
4314
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   255
        modify_conf('/etc/glance/glance-cache.conf',
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   256
                    exception_list=GLANCE_CACHE_EXCEPTIONS)
4072
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   257
        modify_conf('/etc/glance/glance-registry.conf',
4314
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   258
                    GLANCE_REGISTRY_MAPPINGS,
6035
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   259
                    exception_list=GLANCE_REGISTRY_EXCEPTIONS)
4072
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   260
        modify_conf('/etc/glance/glance-registry-paste.ini')
4314
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   261
        modify_conf('/etc/glance/glance-scrubber.conf',
6035
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4625
diff changeset
   262
                    exception_list=GLANCE_SCRUBBER_EXCEPTIONS)
4072
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   263
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   264
    config = iniparse.RawConfigParser()
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   265
    config.read('/etc/glance/glance-api.conf')
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   266
    # In certain cases the database section does not exist and the
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   267
    # default database chosen is sqlite.
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   268
    if config.has_section('database'):
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   269
        db_connection = config.get('database', 'connection')
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   270
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   271
        if db_connection.startswith('mysql'):
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   272
            engine = sqlalchemy.create_engine(db_connection)
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   273
            if engine.url.username != '%SERVICE_USER%':
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   274
                alter_mysql_tables(engine)
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   275
                print "altered character set to utf8 in glance tables"
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   276
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   277
    # update the current version
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   278
    check_call(['/usr/sbin/svccfg', '-s', os.environ['SMF_FMRI'], 'setprop',
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   279
               'config/upgrade-id', '=', pkg_ver])
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   280
    check_call(['/usr/sbin/svccfg', '-s', os.environ['SMF_FMRI'], 'refresh'])
4314
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   281
4072
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   282
    sys.exit(smf_include.SMF_EXIT_OK)
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   283
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   284
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   285
if __name__ == '__main__':
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   286
    os.putenv('LC_ALL', 'C')
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   287
    try:
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   288
        smf_include.smf_main()
4314
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   289
    except RuntimeError:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4207
diff changeset
   290
        sys.exit(smf_include.SMF_EXIT_ERR_FATAL)
4072
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   291
    except Exception as err:
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   292
        print 'Unknown error:  %s' % err
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   293
        print
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   294
        traceback.print_exc(file=sys.stdout)
db0cec748ec0 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   295
        sys.exit(smf_include.SMF_EXIT_ERR_FATAL)