1 In-house patch to include options defined in nova.network.neutronv2.api

     2 that are missing from the nova.conf generated by

     3 tools/config/generate_sample.sh. Some of these options are deprecated,

     4 although valid, in Kilo but they are removed in Liberty.

     5 

     6 --- nova-2015.1.2/nova/network/neutronv2/api.py.orig	2016-03-22 22:03:30.626104765 -0700

     7 +++ nova-2015.1.2/nova/network/neutronv2/api.py	2016-03-22 22:19:18.869889129 -0700

     8 @@ -142,6 +142,7 @@ _ADMIN_AUTH = None

     9  

    10  def list_opts():

    11      list = copy.deepcopy(_neutron_options)

    12 +    list.extend(neutron_opts)

    13      list.insert(0, auth.get_common_conf_options()[0])

    14      # NOTE(dims): There are a lot of auth plugins, we just generate

    15      # the config options for a few common ones