components/openstack/common/files/openstack_common.py
author Devjani Ray <devjani.ray@oracle.com>
Fri, 20 May 2016 17:42:29 -0400
branchs11u3-sru
changeset 6035 c9748fcc32de
parent 4364 7e498582e773
child 6031 1aaf20a19738
child 7319 0753ecc76d4d
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:
4314
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     1
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     2
#
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     3
#    Licensed under the Apache License, Version 2.0 (the "License"); you may
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     4
#    not use this file except in compliance with the License. You may obtain
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     5
#    a copy of the License at
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     6
#
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     7
#         http://www.apache.org/licenses/LICENSE-2.0
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     8
#
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     9
#    Unless required by applicable law or agreed to in writing, software
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    10
#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    11
#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    12
#    License for the specific language governing permissions and limitations
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    13
#    under the License.
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    14
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    15
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    16
""" openstack_upgrade - common functions used by the various OpenStack
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    17
components to facilitate upgrading of configuration files and MySQL
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    18
databases/tables (if in use)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    19
"""
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    20
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    21
from ConfigParser import NoOptionError
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    22
from datetime import datetime
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    23
import errno
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    24
import glob
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    25
import os
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    26
import shutil
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    27
import time
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    28
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    29
import iniparse
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    30
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    31
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    32
def create_backups(directory):
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    33
    """ create backups of each configuration file which also has a .new file
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    34
    from the upgrade.
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    35
    """
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    36
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    37
    today = datetime.now().strftime("%Y%m%d%H%M%S")
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    38
    cwd = os.getcwd()
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    39
    os.chdir(directory)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    40
    for new_file in glob.glob('*.new'):
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    41
        # copy the old conf file to a backup
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    42
        old_file = new_file.replace('.new', '')
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    43
        try:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    44
            shutil.copy2(old_file, old_file + '.' + today)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    45
        except (IOError, OSError):
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    46
            print 'unable to create a backup of %s' % old_file
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    47
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    48
    os.chdir(cwd)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    49
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    50
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    51
def update_mapping(section, key, mapping):
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    52
    """ look for deprecated variables and, if found, convert it to the new
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    53
    section/key.
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    54
    """
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    55
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    56
    if (section, key) in mapping:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    57
        print "Deprecated value found: [%s] %s" % (section, key)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    58
        section, key = mapping[(section, key)]
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    59
        if section is None and key is None:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    60
            print "Removing from configuration"
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    61
        else:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    62
            print "Updating to: [%s] %s" % (section, key)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    63
    return section, key
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    64
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    65
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    66
def alter_mysql_tables(engine):
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    67
    """ Convert MySQL tables to use utf8
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    68
    """
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    69
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    70
    import MySQLdb
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    71
4364
7e498582e773 21150246 MySQL needs more time to come online
Drew Fisher <drew.fisher@oracle.com>
parents: 4314
diff changeset
    72
    for _none in range(60):
4314
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    73
        try:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    74
            db = MySQLdb.connect(host=engine.url.host,
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    75
                                 user=engine.url.username,
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    76
                                 passwd=engine.url.password,
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    77
                                 db=engine.url.database)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    78
            break
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    79
        except MySQLdb.OperationalError as err:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    80
            # mysql is not ready. sleep for 2 more seconds
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    81
            time.sleep(2)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    82
    else:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    83
        print "Unable to connect to MySQL:  %s" % err
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    84
        print ("Please verify MySQL is properly configured and online "
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    85
               "before using svcadm(1M) to clear this service.")
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    86
        raise RuntimeError
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    87
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    88
    cursor = db.cursor()
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    89
    cursor.execute("SHOW table status")
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    90
    cursor.execute("ALTER DATABASE %s CHARACTER SET = 'utf8'" %
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    91
                   engine.url.database)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    92
    cursor.execute("ALTER DATABASE %s COLLATE = 'utf8_general_ci'" %
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    93
                   engine.url.database)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    94
    cursor.execute("SHOW tables")
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    95
    res = cursor.fetchall()
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    96
    if res:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    97
        cursor.execute("SET foreign_key_checks = 0")
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    98
        for item in res:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    99
            cursor.execute("ALTER TABLE %s.%s CONVERT TO "
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   100
                           "CHARACTER SET 'utf8', COLLATE 'utf8_general_ci'"
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   101
                           % (engine.url.database, item[0]))
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   102
        cursor.execute("SET foreign_key_checks = 1")
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   103
        db.commit()
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   104
        db.close()
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   105
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   106
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   107
def modify_conf(old_file, mapping=None, exception_list=None):
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   108
    """ Copy over all uncommented options from the old configuration file.  In
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   109
    addition, look for deprecated section/keys and convert them to the new
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   110
    section/key.
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   111
    """
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   112
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   113
    new_file = old_file + '.new'
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   114
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   115
    # open the previous version
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   116
    old = iniparse.ConfigParser()
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   117
    old.readfp(open(old_file))
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   118
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   119
    # open the new version
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   120
    new = iniparse.ConfigParser()
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   121
    try:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   122
        new.readfp(open(new_file))
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   123
    except IOError as err:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   124
        if err.errno == errno.ENOENT:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   125
            # The upgrade did not deliver a .new file so, return
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   126
            print "%s not found - continuing with %s" % (new_file, old_file)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   127
            return
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   128
        else:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   129
            raise
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   130
    print "\nupdating %s" % old_file
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   131
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   132
    # walk every single section for uncommented options
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   133
    default_items = set(old.items('DEFAULT'))
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   134
    for old_section in old.sections() + ['DEFAULT']:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   135
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   136
        # DEFAULT items show up in every section so remove them
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   137
        if old_section != 'DEFAULT':
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   138
            section_items = set(old.items(old_section)) - default_items
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   139
        else:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   140
            section_items = default_items
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   141
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   142
        for old_key, value in section_items:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   143
            # Look for deprecated section/keys
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   144
            if mapping is not None:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   145
                new_section, new_key = update_mapping(old_section, old_key,
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   146
                                                      mapping)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   147
                if new_section is None and new_key is None:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   148
                    # option is deprecated so continue
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   149
                    continue
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   150
            else:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   151
                # no deprecated values for this file so just copy the values
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   152
                # over
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   153
                new_section, new_key = old_section, old_key
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   154
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   155
            # Look for exceptions
6035
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4364
diff changeset
   156
            if exception_list:
4314
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   157
                if (new_section, new_key) in exception_list:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   158
                    if (new_section != 'DEFAULT' and
6035
c9748fcc32de PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4364
diff changeset
   159
                            not new.has_section(new_section)):
4314
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   160
                        new.add_section(new_section)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   161
                    print "Preserving [%s] %s = %s" % \
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   162
                        (new_section, new_key, value)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   163
                    new.set(new_section, new_key, value)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   164
                    continue
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   165
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   166
            if new_section != 'DEFAULT' and not new.has_section(new_section):
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   167
                new.add_section(new_section)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   168
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   169
            # print to the log when a value for old_section.old_key is changing
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   170
            # to a new value
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   171
            try:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   172
                new_value = new.get(new_section, new_key)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   173
                if new_value != value and '%SERVICE' not in new_value:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   174
                    print "Changing [%s] %s:\n- %s\n+ %s" % \
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   175
                        (old_section, old_key, value, new_value)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   176
                    print
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   177
            except NoOptionError:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   178
                # the new configuration file does not have this option set so
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   179
                # just continue
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   180
                pass
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   181
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   182
            # Only copy the old value to the new conf file if the entry doesn't
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   183
            # exist in the new file or if it contains '%SERVICE'
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   184
            if not new.has_option(new_section, new_key) or \
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   185
               '%SERVICE' in new.get(new_section, new_key):
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   186
                new.set(new_section, new_key, value)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   187
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   188
    # copy the new conf file in place
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   189
    with open(old_file, 'wb+') as fh:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   190
        new.write(fh)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   191
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   192
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   193
def move_conf(original_file, new_file, mapping):
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   194
    """ move each entry in mapping from the original file to the new file.
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   195
    """
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   196
    # open the original file
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   197
    original = iniparse.ConfigParser()
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   198
    original.readfp(open(original_file))
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   199
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   200
    # open the new file
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   201
    new = iniparse.ConfigParser()
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   202
    new.readfp(open(new_file))
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   203
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   204
    # The mappings dictionary look similar to the deprecation mappings:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   205
    # (original_section, original_key): (new_section, new_key)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   206
    for (original_section, original_key) in mapping:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   207
        try:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   208
            original_value = original.get(original_section, original_key)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   209
        except NoOptionError:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   210
            # the original file does not contain this mapping so continue
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   211
            continue
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   212
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   213
        new_section, new_key = mapping.get((original_section, original_key))
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   214
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   215
        if new_section != 'DEFAULT' and not new.has_section(new_section):
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   216
            new.add_section(new_section)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   217
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   218
        print 'Moving [%s] %s from %s to [%s] %s in %s' % \
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   219
            (original_section, original_key, original_file,
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   220
             new_section, new_key, new_file)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   221
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   222
        # set the option in the new file
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   223
        new.set(new_section, new_key, original_value)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   224
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   225
        # remove the option from the old file
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   226
        original.remove_option(original_section, original_key)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   227
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   228
    with open(original_file, 'wb+') as fh:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   229
        original.write(fh)
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   230
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   231
    with open(new_file, 'wb+') as fh:
96c1b7e2e45c PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
   232
        new.write(fh)