PSARC 2015/110 OpenStack service updates for Juno PSARC 2014/302 oslo.messaging - OpenStack RPC and notifications PSARC 2014/303 concurrent.futures - high-level Python interface for asynchronous execution PSARC 2014/304 networkx - Python module for complex networks PSARC 2014/305 taskflow - Python module for task execution PSARC 2014/329 pycadf - Python interface for CADF (cloud auditing) PSARC 2014/330 posix_ipc - POSIX IPC primitives for Python PSARC 2014/331 oauthlib - Python implementation of OAuth request-signing logic PSARC 2015/058 oslo - OpenStack common libraries (context, db, i18n, middleware, serialization, utils, vmware) PSARC 2015/059 glance_store - Glance storage library PSARC 2015/060 ipaddr - an IPv4/IPv6 manipulation library in Python PSARC 2015/061 simplegeneric - single-dispatch generic Python functions PSARC 2015/062 wsme - Web Services Made Easy PSARC 2015/063 retrying - General purpose Python retrying library PSARC 2015/065 osprofiler - an OpenStack cross-project profiling library PSARC 2015/066 OpenStack client for Sahara (Hadoop as a Service) PSARC 2015/067 keystonemiddleware - Middleware for OpenStack Identity PSARC 2015/068 pyScss - Compiler for the SCSS flavor of the Sass language PSARC 2015/069 django-pyscss - pyScss support for Django PSARC 2015/073 barbicanclient - OpenStack client for Barbican (Key Management) PSARC 2015/074 pysendfile - Python interface to sendfile PSARC 2015/097 ldappool - a connection pool for python-ldap PSARC 2015/098 rfc3986 - URI reference validation module for Python PSARC 2015/102 iniparse - python .ini file parsing module 20667775 OpenStack service updates for Juno (Umbrella) 18615101 Horizon should prevent network, subnet, and port names with hyphens in them 18772068 instance failed to launch with NoValidHost but no reason 18887457 openstack shouldn't deliver .po files 18905324 hostname.xml should set config/ignore_dhcp_hostname = true 18961031 Duplicate names for role-create and user-create are allowed 19015363 Users should not be allowed to attempt to create volumes when quota exceed 19050335 user appears logged in but unauthorised after horizon reboot 19144215 Instance manipulation buttons greyed out after all instances terminated 19249066 heat stack-preview doesn't appear to do anything 19313272 Need bottom slidebar in horizon for small browser windows 19462265 The Python module oslo.messaging should be added to Userland 19462397 The Python module futures should be added to Userland 19476604 The Python module networkx should be added to Userland 19476953 The Python module taskflow should be added to Userland 19519227 The Python module pycadf should be added to Userland 19582394 The Python module posix_ipc should be added to Userland 19598430 The Python module oauthlib should be added to Userland 19815780 nova package should have dependencies on brand-solaris and brand-solaris-kz 19883623 Image snapshots are missing 'instance_uuid' property 19887874 horizon should set up apache log rotation 19987962 Cinder lists additional volumes attached to instance with linuxy device names 20027791 horizon should be migrated to Apache 2.4 20164815 The Python module django-pyscss should be added to Userland 20173049 The Python module retrying should be added to Userland 20174489 The Python module WSME should be added to Userland 20176001 The Python module keystonemiddleware should be added to Userland 20182039 The Python module pysendfile should be added to Userland 20200162 The Python module pyScss should be added to Userland 20222184 horizon doesn't send start request on shutdown instance 20312312 The Python module python-saharaclient should be added to Userland 20514287 wrong vnic label name used for dhcp vnic in evs 20596802 The Python module oslo.middleware should be added to Userland 20596803 The Python module barbicanclient should be added to Userland 20596804 The Python module oslo.context should be added to Userland 20596805 The Python module iniparse should be added to Userland 20596806 The Python module oslo.vmware should be added to Userland 20596807 The Python module osprofiler should be added to Userland 20596808 The Python module oslo.i18n should be added to Userland 20596809 The Python module oslo.utils should be added to Userland 20596811 The Python module ipaddr should be added to Userland 20596812 The Python module glance_store should be added to Userland 20596813 The Python module oslo.serialization should be added to Userland 20596814 The Python module oslo.db should be added to Userland 20596815 The Python module simplegeneric should be added to Userland 20602690 The Python module ldappool should be added to Userland 20602722 The Python module rfc3986 should be added to Userland 20638369 compilemessages.py requires GNU msgfmt without calling gmsgfmt 20715741 cinder 2014.2.2 20715742 glance 2014.2.2 20715743 heat 2014.2.2 20715744 horizon 2014.2.2 20715745 keystone 2014.2.2 20715746 neutron 2014.2.2 20715747 nova 2014.2.2 20715748 swift 2.2.2 20715749 alembic 0.7.4 20715750 amqp 1.4.6 20715751 boto 2.34.0 20715752 ceilometerclient 1.0.12 20715753 cinderclient 1.1.1 20715754 cliff 1.9.0 20715756 django 1.4.19 20715757 django_compressor 1.4 20715758 django_openstack_auth 1.1.9 20715759 eventlet 0.15.2 20715761 glanceclient 0.15.0 20715762 greenlet 0.4.5 20715763 heatclient 0.2.12 20715764 keystoneclient 1.0.0 20715765 kombu 3.0.7 20715766 mysql 1.2.5 20715767 netaddr 0.7.13 20715769 netifaces 0.10.4 20715770 neutronclient 2.3.10 20715771 novaclient 2.20.0 20715772 oslo.config 1.6.0 20715773 py 1.4.26 20715774 pyflakes 0.8.1 20715775 pytest 2.6.4 20715776 pytz 2014.10 20715777 requests 2.6.0 20715778 simplejson 3.6.5 20715779 six 1.9.0 20715780 sqlalchemy-migrate 0.9.1 20715781 sqlalchemy 0.9.8 20715782 stevedore 1.2.0 20715783 swiftclient 2.3.1 20715784 tox 1.8.1 20715785 troveclient 1.0.8 20715786 virtualenv 12.0.7 20715787 websockify 0.6.0

     1

#!/usr/bin/python2.6

     2

     3

# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.

     4

#

     5

#    Licensed under the Apache License, Version 2.0 (the "License"); you may

     6

#    not use this file except in compliance with the License. You may obtain

     7

#    a copy of the License at

     8

#

     9

#         http://www.apache.org/licenses/LICENSE-2.0

    10

#

    11

#    Unless required by applicable law or agreed to in writing, software

    12

#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT

    13

#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

    14

#    License for the specific language governing permissions and limitations

    15

#    under the License.

    16

    17

from ConfigParser import NoOptionError

    18

from datetime import datetime

    19

import errno

    20

import glob

    21

import os

    22

import shutil

    23

from subprocess import check_call, Popen, PIPE

    24

import sys

    25

import traceback

    26

    27

import iniparse

    28

import smf_include

    29

    30

    31

def modify_conf(old_file):

    32

    """ Copy over all uncommented options from the old configuration file.

    33

    """

    34

    35

    new_file = old_file + '.new'

    36

    37

    # open the previous version

    38

    old = iniparse.ConfigParser()

    39

    old.readfp(open(old_file))

    40

    41

    # open the new version

    42

    new = iniparse.ConfigParser()

    43

    try:

    44

        new.readfp(open(new_file))

    45

    except IOError as err:

    46

        if err.errno == errno.ENOENT:

    47

            # The upgrade did not deliver a .new file so, return

    48

            print "%s not found - continuing with %s" % (new_file, old_file)

    49

            return

    50

        else:

    51

            raise

    52

    print "\nupdating %s" % old_file

    53

    54

    # walk every single section for uncommented options

    55

    default_items = set(old.items('DEFAULT'))

    56

    for section in old.sections() + ['DEFAULT']:

    57

    58

        # DEFAULT items show up in every section so remove them

    59

        if section != 'DEFAULT':

    60

            section_items = set(old.items(section)) - default_items

    61

        else:

    62

            section_items = default_items

    63

    64

        for key, value in section_items:

    65

            # keep a copy of the old value

    66

            oldvalue = value

    67

    68

            if not new.has_section(section):

    69

                if section != 'DEFAULT':

    70

                    new.add_section(section)

    71

    72

            # print to the log when a value for the same section.key is

    73

            # changing to a new value

    74

            try:

    75

                new_value = new.get(section, key)

    76

                if new_value != value and '%SERVICE' not in new_value:

    77

                    print "Changing [%s] %s:\n- %s\n+ %s" % \

    78

                        (section, key, oldvalue, new_value)

    79

                    print

    80

            except NoOptionError:

    81

                # the new configuration file does not have this option set so

    82

                # just continue

    83

                pass

    84

    85

            # Only copy the old value to the new conf file if the entry doesn't

    86

            # exist or if it contains '%SERVICE'

    87

            if not new.has_option(section, key) or \

    88

               '%SERVICE' in new.get(section, key):

    89

                new.set(section, key, value)

    90

    91

    # copy the old conf file to a backup

    92

    today = datetime.now().strftime("%Y%m%d%H%M%S")

    93

    shutil.copy2(old_file, old_file + '.' + today)

    94

    95

    # copy the new conf file in place

    96

    with open(old_file, 'wb+') as fh:

    97

        new.write(fh)

    98

    99

   100

def start():

   101

    # pull out the current version of config/upgrade-id

   102

    p = Popen(['/usr/bin/svcprop', '-p', 'config/upgrade-id',

   103

               os.environ['SMF_FMRI']], stdout=PIPE, stderr=PIPE)

   104

    curr_ver, _err = p.communicate()

   105

    curr_ver = curr_ver.strip()

   106

   107

    # extract the openstack-upgrade-id from the pkg

   108

    p = Popen(['/usr/bin/pkg', 'contents', '-H', '-t', 'set', '-o', 'value',

   109

               '-a', 'name=openstack.upgrade-id',

   110

               'pkg:/cloud/openstack/swift'], stdout=PIPE, stderr=PIPE)

   111

    pkg_ver, _err = p.communicate()

   112

    pkg_ver = pkg_ver.strip()

   113

   114

    if curr_ver == pkg_ver:

   115

        # No need to upgrade

   116

        sys.exit(smf_include.SMF_EXIT_OK)

   117

   118

    # look for any .new files

   119

    if glob.glob('/etc/swift/*.new'):

   120

        # the versions are different, so perform an upgrade

   121

        # modify the configuration files

   122

        modify_conf('/etc/swift/account-server.conf')

   123

        modify_conf('/etc/swift/container-reconciler.conf')

   124

        modify_conf('/etc/swift/container-server.conf')

   125

        modify_conf('/etc/swift/container-sync-realms.conf')

   126

        modify_conf('/etc/swift/dispersion.conf')

   127

        modify_conf('/etc/swift/memcache.conf')

   128

        modify_conf('/etc/swift/object-expirer.conf')

   129

        modify_conf('/etc/swift/object-server.conf')

   130

        modify_conf('/etc/swift/proxy-server.conf')

   131

        modify_conf('/etc/swift/swift.conf')

   132

   133

    # update the current version

   134

    check_call(['/usr/sbin/svccfg', '-s', os.environ['SMF_FMRI'], 'setprop',

   135

               'config/upgrade-id', '=', pkg_ver])

   136

    check_call(['/usr/sbin/svccfg', '-s', os.environ['SMF_FMRI'], 'refresh'])

   137

   138

    sys.exit(smf_include.SMF_EXIT_OK)

   139

   140

   141

if __name__ == '__main__':

   142

    os.putenv('LC_ALL', 'C')

   143

    try:

   144

        smf_include.smf_main()

   145

    except Exception as err:

   146

        print 'Unknown error:  %s' % err

   147

        print

   148

        traceback.print_exc(file=sys.stdout)

   149

        sys.exit(smf_include.SMF_EXIT_ERR_FATAL)