components/openstack/neutron/files/neutron-upgrade
author Laszlo Peter <laszlo.peter@oracle.com>
Wed, 07 Sep 2016 14:48:41 -0700
changeset 6848 8e252a37ed0d
parent 6031 1aaf20a19738
child 6876 81ad8e956766
permissions -rw-r--r--
PSARC 2016/268 Neutron EVS Plugin EOF 24465835 Update Neutron for the Mitaka release 22271305 EOF monolithic neutron plugin for Openstack 18734794 port-create --fixed-ip accepts invalid argument, creates port with wrong IP
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4049
150852e281c4 20816335 move the core OpenStack components to Python 2.7
Drew Fisher <drew.fisher@oracle.com>
parents: 3998
diff changeset
     1
#!/usr/bin/python2.7
3998
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     2
5405
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4653
diff changeset
     3
# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
3998
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     4
#
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     5
#    Licensed under the Apache License, Version 2.0 (the "License"); you may
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     6
#    not use this file except in compliance with the License. You may obtain
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     7
#    a copy of the License at
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     8
#
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     9
#         http://www.apache.org/licenses/LICENSE-2.0
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    10
#
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    11
#    Unless required by applicable law or agreed to in writing, software
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    12
#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    13
#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    14
#    License for the specific language governing permissions and limitations
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    15
#    under the License.
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    16
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    17
import glob
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    18
import os
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    19
from subprocess import check_call, Popen, PIPE
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    20
import sys
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    21
import traceback
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    22
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    23
import smf_include
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    24
4287
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
    25
from openstack_common import alter_mysql_tables, create_backups, modify_conf
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
    26
3998
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    27
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    28
NEUTRON_CONF_MAPPINGS = {
6848
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    29
    # Deprecated group/name for Liberty
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    30
    ('DEFAULT', 'use_syslog'): (None, None),
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    31
    ('DEFAULT', 'log_format'): (None, None),
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    32
    ('DEFAULT', 'rpc_thread_pool_size'):
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    33
        ('DEFAULT', 'executor_thread_pool_size'),
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    34
    ('ml2_sriov', 'agent_required'): (None, None),
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    35
    # Deprecated group/name for Mitaka
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    36
    ('ml2', 'segment_mtu'): ('DEFAULT', 'global_physnet_mtu'),
5405
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4653
diff changeset
    37
    ('DEFAULT', 'nova_region_name'): ('nova', 'region_name'),
6848
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    38
    ('DEFAULT', 'nova_admin_username'): ('nova', 'username'),
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    39
    ('DEFAULT', 'nova_admin_tenant_id'): ('nova', 'tenant_id'),
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    40
    ('DEFAULT', 'nova_admin_tenant_name'): ('nova', 'tenant_name'),
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    41
    ('DEFAULT', 'nova_admin_password'): ('nova', 'password'),
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    42
    ('DEFAULT', 'nova_admin_auth_url'): ('nova', 'auth_url'),
3998
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    43
}
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    44
4287
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
    45
NEUTRON_CONF_EXCEPTIONS = [
5405
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4653
diff changeset
    46
    ('database', 'connection'),
4287
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
    47
    ('keystone_authtoken', 'auth_uri'),
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
    48
    ('keystone_authtoken', 'identity_uri'),
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
    49
    ('keystone_authtoken', 'admin_tenant_name'),
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
    50
    ('keystone_authtoken', 'admin_user'),
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
    51
    ('keystone_authtoken', 'admin_password'),
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
    52
    ('keystone_authtoken', 'signing_dir'),
6031
1aaf20a19738 PSARC/2016/251 OpenStack Neutron ML2 framework and OVS mechanism driver
Girish Moodalbail <Girish.Moodalbail@oracle.COM>
parents: 5865
diff changeset
    53
    # Do not overwrite EVS options with OVS options since upgrade
1aaf20a19738 PSARC/2016/251 OpenStack Neutron ML2 framework and OVS mechanism driver
Girish Moodalbail <Girish.Moodalbail@oracle.COM>
parents: 5865
diff changeset
    54
    # doesn't handle EVS to OVS upgrade
1aaf20a19738 PSARC/2016/251 OpenStack Neutron ML2 framework and OVS mechanism driver
Girish Moodalbail <Girish.Moodalbail@oracle.COM>
parents: 5865
diff changeset
    55
    ('DEFAULT', 'core_plugin'),
1aaf20a19738 PSARC/2016/251 OpenStack Neutron ML2 framework and OVS mechanism driver
Girish Moodalbail <Girish.Moodalbail@oracle.COM>
parents: 5865
diff changeset
    56
    ('DEFAULT', 'service_plugins'),
4287
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
    57
]
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
    58
6031
1aaf20a19738 PSARC/2016/251 OpenStack Neutron ML2 framework and OVS mechanism driver
Girish Moodalbail <Girish.Moodalbail@oracle.COM>
parents: 5865
diff changeset
    59
L3_AGENT_EXCEPTIONS = [
1aaf20a19738 PSARC/2016/251 OpenStack Neutron ML2 framework and OVS mechanism driver
Girish Moodalbail <Girish.Moodalbail@oracle.COM>
parents: 5865
diff changeset
    60
    # Do not overwrite EVS options with OVS options since upgrade
1aaf20a19738 PSARC/2016/251 OpenStack Neutron ML2 framework and OVS mechanism driver
Girish Moodalbail <Girish.Moodalbail@oracle.COM>
parents: 5865
diff changeset
    61
    # doesn't handle EVS to OVS migration
1aaf20a19738 PSARC/2016/251 OpenStack Neutron ML2 framework and OVS mechanism driver
Girish Moodalbail <Girish.Moodalbail@oracle.COM>
parents: 5865
diff changeset
    62
    ('DEFAULT', 'ovs_integration_bridge'),
1aaf20a19738 PSARC/2016/251 OpenStack Neutron ML2 framework and OVS mechanism driver
Girish Moodalbail <Girish.Moodalbail@oracle.COM>
parents: 5865
diff changeset
    63
    ('DEFAULT', 'interface_driver'),
1aaf20a19738 PSARC/2016/251 OpenStack Neutron ML2 framework and OVS mechanism driver
Girish Moodalbail <Girish.Moodalbail@oracle.COM>
parents: 5865
diff changeset
    64
    ('DEFAULT', 'external_network_bridge'),
6848
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    65
    ('DEFAULT', 'evs_controller'),
6031
1aaf20a19738 PSARC/2016/251 OpenStack Neutron ML2 framework and OVS mechanism driver
Girish Moodalbail <Girish.Moodalbail@oracle.COM>
parents: 5865
diff changeset
    66
]
1aaf20a19738 PSARC/2016/251 OpenStack Neutron ML2 framework and OVS mechanism driver
Girish Moodalbail <Girish.Moodalbail@oracle.COM>
parents: 5865
diff changeset
    67
1aaf20a19738 PSARC/2016/251 OpenStack Neutron ML2 framework and OVS mechanism driver
Girish Moodalbail <Girish.Moodalbail@oracle.COM>
parents: 5865
diff changeset
    68
DHCP_AGENT_EXCEPTIONS = [
1aaf20a19738 PSARC/2016/251 OpenStack Neutron ML2 framework and OVS mechanism driver
Girish Moodalbail <Girish.Moodalbail@oracle.COM>
parents: 5865
diff changeset
    69
    # Do not overwrite EVS options with OVS options since upgrade
1aaf20a19738 PSARC/2016/251 OpenStack Neutron ML2 framework and OVS mechanism driver
Girish Moodalbail <Girish.Moodalbail@oracle.COM>
parents: 5865
diff changeset
    70
    # doesn't handle EVS to OVS migration
1aaf20a19738 PSARC/2016/251 OpenStack Neutron ML2 framework and OVS mechanism driver
Girish Moodalbail <Girish.Moodalbail@oracle.COM>
parents: 5865
diff changeset
    71
    ('DEFAULT', 'ovs_integration_bridge'),
1aaf20a19738 PSARC/2016/251 OpenStack Neutron ML2 framework and OVS mechanism driver
Girish Moodalbail <Girish.Moodalbail@oracle.COM>
parents: 5865
diff changeset
    72
    ('DEFAULT', 'interface_driver'),
1aaf20a19738 PSARC/2016/251 OpenStack Neutron ML2 framework and OVS mechanism driver
Girish Moodalbail <Girish.Moodalbail@oracle.COM>
parents: 5865
diff changeset
    73
    ('DEFAULT', 'evs_controller'),
1aaf20a19738 PSARC/2016/251 OpenStack Neutron ML2 framework and OVS mechanism driver
Girish Moodalbail <Girish.Moodalbail@oracle.COM>
parents: 5865
diff changeset
    74
]
3998
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    75
4287
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
    76
METADATA_AGENT_EXCEPTIONS = [
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
    77
    ('DEFAULT', 'auth_url'),
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
    78
    ('DEFAULT', 'auth_region'),
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
    79
    ('DEFAULT', 'admin_tenant_name'),
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
    80
    ('DEFAULT', 'admin_user'),
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
    81
    ('DEFAULT', 'admin_password'),
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
    82
    ('DEFAULT', 'metadata_workers'),
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
    83
]
3998
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    84
6848
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    85
OPENVSWITCH_AGENT_EXCEPTIONS = [
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    86
    ('ovs', 'integration_bridge'),
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    87
    ('ovs', 'tunnel_bridge'),
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    88
    ('securitygroup', 'enable_security_group'),
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    89
    ('securitygroup', 'enable_ipset'),
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    90
]
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    91
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    92
ML2_CONF_EXCEPTION = [
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    93
    ('ml2', 'type_drivers'),
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    94
    ('ml2', 'tenant_network_types'),
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    95
    ('ml2', 'mechanism_drivers'),
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    96
    ('securitygroup', 'enable_security_group'),
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    97
    ('securitygroup', 'enable_ipset'),
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    98
]
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
    99
3998
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   100
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   101
def start():
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   102
    # pull out the current version of config/upgrade-id
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   103
    p = Popen(['/usr/bin/svcprop', '-p', 'config/upgrade-id',
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   104
               os.environ['SMF_FMRI']], stdout=PIPE, stderr=PIPE)
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   105
    curr_ver, _err = p.communicate()
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   106
    curr_ver = curr_ver.strip()
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   107
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   108
    # extract the openstack-upgrade-id from the pkg
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   109
    p = Popen(['/usr/bin/pkg', 'contents', '-H', '-t', 'set', '-o', 'value',
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   110
               '-a', 'name=openstack.upgrade-id',
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   111
               'pkg:/cloud/openstack/neutron'], stdout=PIPE, stderr=PIPE)
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   112
    pkg_ver, _err = p.communicate()
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   113
    pkg_ver = pkg_ver.strip()
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   114
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   115
    if curr_ver == pkg_ver:
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   116
        # No need to upgrade
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   117
        sys.exit(smf_include.SMF_EXIT_OK)
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   118
6848
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
   119
    # TODO: Kilo EVS check. If upgrade is from Kilo running EVS,
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
   120
    # fail the upgrade.
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
   121
3998
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   122
    # look for any .new files
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   123
    if glob.glob('/etc/neutron/*.new'):
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   124
        # the versions are different, so perform an upgrade
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   125
        # modify the configuration files
4287
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
   126
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
   127
        # backup all the old configuration files
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
   128
        create_backups('/etc/neutron')
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
   129
3998
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   130
        modify_conf('/etc/neutron/api-paste.ini')
5405
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents: 4653
diff changeset
   131
        modify_conf('/etc/neutron/dhcp_agent.ini')
5719
cc86944e6c65 22935039 Kilo upgrade conf file migration errors
Padma Dakoju <padma.dakoju@oracle.com>
parents: 5405
diff changeset
   132
        modify_conf('/etc/neutron/l3_agent.ini', mapping=None,
cc86944e6c65 22935039 Kilo upgrade conf file migration errors
Padma Dakoju <padma.dakoju@oracle.com>
parents: 5405
diff changeset
   133
                    exception_list=L3_AGENT_EXCEPTIONS)
4287
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
   134
        modify_conf('/etc/neutron/neutron.conf', NEUTRON_CONF_MAPPINGS,
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
   135
                    NEUTRON_CONF_EXCEPTIONS)
5719
cc86944e6c65 22935039 Kilo upgrade conf file migration errors
Padma Dakoju <padma.dakoju@oracle.com>
parents: 5405
diff changeset
   136
        modify_conf('/etc/neutron/metadata_agent.ini', mapping=None,
cc86944e6c65 22935039 Kilo upgrade conf file migration errors
Padma Dakoju <padma.dakoju@oracle.com>
parents: 5405
diff changeset
   137
                    exception_list=METADATA_AGENT_EXCEPTIONS)
3998
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   138
6848
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
   139
    # look for any .new files for ml2 plugin
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
   140
    if glob.glob('/etc/neutron/plugins/ml2/*.new'):
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
   141
        # modify the configuration files
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
   142
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
   143
        # backup all the old configuration files
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
   144
        create_backups('/etc/neutron/plugins/ml2')
5840
ed8b04bef26e 22878181 Neutron database tables not upgraded properly from Juno to Kilo schema
Padma Dakoju <padma.dakoju@oracle.com>
parents: 5719
diff changeset
   145
6848
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
   146
        modify_conf('/etc/neutron/plugins/ml2/openvswitch_agent.ini',
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
   147
                    mapping=None,
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
   148
                    exception_list=OPENVSWITCH_AGENT_EXCEPTIONS)
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
   149
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
   150
        modify_conf('/etc/neutron/plugins/ml2/ml2_conf.ini',
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
   151
                    mapping=None,
8e252a37ed0d PSARC 2016/268 Neutron EVS Plugin EOF
Laszlo Peter <laszlo.peter@oracle.com>
parents: 6031
diff changeset
   152
                    exception_list=ML2_CONF_EXCEPTION)
3998
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   153
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   154
    # update the current version
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   155
    check_call(['/usr/sbin/svccfg', '-s', os.environ['SMF_FMRI'], 'setprop',
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   156
               'config/upgrade-id', '=', pkg_ver])
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   157
    check_call(['/usr/sbin/svccfg', '-s', os.environ['SMF_FMRI'], 'refresh'])
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   158
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   159
    sys.exit(smf_include.SMF_EXIT_OK)
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   160
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   161
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   162
if __name__ == '__main__':
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   163
    os.putenv('LC_ALL', 'C')
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   164
    try:
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   165
        smf_include.smf_main()
4287
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
   166
    except RuntimeError:
aba3ed31b37a PSARC/2015/233 OpenStack Common Package
Drew Fisher <drew.fisher@oracle.com>
parents: 4181
diff changeset
   167
        sys.exit(smf_include.SMF_EXIT_ERR_FATAL)
3998
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   168
    except Exception as err:
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   169
        print 'Unknown error:  %s' % err
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   170
        print
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   171
        traceback.print_exc(file=sys.stdout)
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
   172
        sys.exit(smf_include.SMF_EXIT_ERR_FATAL)