053d4599db
The core nova project is consolidating their conf options. This impacted the PowerVM conf options as a few that we were explicitly importing were moved. This change set fixes the issue and allows PowerVM to work properly. The change actually removes the imports, but they are still imported properly because the PowerVM driver imports the 'nova.conf' package (which will background load the parameters). Change-Id: I93c46e74a09cac332b903adeddbd20e859b4b7f5 Closes-Bug: 1578318
24 lines
735 B
Python
24 lines
735 B
Python
# Copyright 2016 IBM Corp.
|
|
#
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import nova.conf
|
|
|
|
from nova_powervm.conf import powervm
|
|
|
|
CONF = nova.conf.CONF
|
|
|
|
powervm.register_opts(CONF)
|