old_contents: # 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
  
  # Pull in the imports that nova-powervm uses so they are validated
  CONF.import_opt('host', 'nova.netconf')
  CONF.import_opt('my_ip', 'nova.netconf')
  CONF.import_opt('vif_plugging_is_fatal', 'nova.virt.driver')
  CONF.import_opt('vif_plugging_timeout', 'nova.virt.driver')
  
  powervm.register_opts(CONF)
  
new_contents: # 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)
  
subject: Support new conf refactor from Nova