old_contents: # Copyright 2016 OpenStack Foundation
  # 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.
  
  from oslo_config import cfg
  
  
  flavor_opts = [
      cfg.StrOpt('default_flavor',
                 default='m1.small',
                 deprecated_for_removal=True,
                 deprecated_reason='The EC2 API is deprecated',
                 help='DEPRECATED: Default flavor to use for the EC2 API only. '
                      'The Nova API does not support a default flavor.'),
  ]
  
  
  def register_opts(conf):
      conf.register_opts(flavor_opts)
  
  
  def list_opts():
      return {'DEFAULT': flavor_opts}
  
new_contents: # Copyright 2016 OpenStack Foundation
  # 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.
  
  from oslo_config import cfg
  
  
  flavor_opts = [
      cfg.StrOpt('default_flavor',
                 default='m1.small',
                 deprecated_for_removal=True,
                 deprecated_reason='The EC2 API is deprecated',
                 help="""
  Default flavor to use for the EC2 API only.
  The Nova API does not support a default flavor.
  
  Possible values:
  
  * Any flavor name, e.g. m1.tiny, m1.small (Default), m1.medium, m1.large
  """),
  ]
  
  
  def register_opts(conf):
      conf.register_opts(flavor_opts)
  
  
  def list_opts():
      return {'DEFAULT': flavor_opts}
  
subject: Improve help text of flavors config options