Remove unused config options
In c12eebd4c6
we missed that there are
another set of config option that become unused now. So this is a follow
up patch to remove those as well.
Change-Id: Ie00805b5f72b118db134aeb8399ef4c72f434966
This commit is contained in:
@ -70,8 +70,6 @@ Configuration
|
||||
The :program:`nova-api` application accepts the following metadata
|
||||
service-related options:
|
||||
|
||||
- :oslo.config:option:`enabled_apis`
|
||||
- :oslo.config:option:`enabled_ssl_apis`
|
||||
- :oslo.config:option:`neutron.service_metadata_proxy`
|
||||
- :oslo.config:option:`neutron.metadata_proxy_shared_secret`
|
||||
- :oslo.config:option:`api.metadata_cache_expiration`
|
||||
@ -90,13 +88,6 @@ following to a :file:`nova-api.conf` file:
|
||||
|
||||
.. code-block:: ini
|
||||
|
||||
[DEFAULT]
|
||||
enabled_apis = osapi_compute,metadata
|
||||
enabled_ssl_apis =
|
||||
metadata_listen = 0.0.0.0
|
||||
metadata_listen_port = 0
|
||||
metadata_workers = 4
|
||||
|
||||
[neutron]
|
||||
service_metadata_proxy = True
|
||||
|
||||
@ -136,11 +127,6 @@ file:
|
||||
|
||||
.. code-block:: ini
|
||||
|
||||
[DEFAULT]
|
||||
metadata_listen = 0.0.0.0
|
||||
metadata_listen_port = 0
|
||||
metadata_workers = 4
|
||||
|
||||
[neutron]
|
||||
service_metadata_proxy = True
|
||||
|
||||
|
@ -32,15 +32,6 @@ Install and configure components
|
||||
|
||||
#. Edit the ``/etc/nova/nova.conf`` file and complete the following actions:
|
||||
|
||||
* In the ``[DEFAULT]`` section, enable only the compute and metadata APIs:
|
||||
|
||||
.. path /etc/nova/nova.conf
|
||||
.. code-block:: ini
|
||||
|
||||
[DEFAULT]
|
||||
# ...
|
||||
enabled_apis = osapi_compute,metadata
|
||||
|
||||
* In the ``[DEFAULT]`` section, set the ``compute_driver``:
|
||||
|
||||
.. path /etc/nova/nova.conf
|
||||
|
@ -32,16 +32,6 @@ Install and configure components
|
||||
|
||||
#. Edit the ``/etc/nova/nova.conf`` file and complete the following actions:
|
||||
|
||||
* In the ``[DEFAULT]`` section, enable only the compute and
|
||||
metadata APIs:
|
||||
|
||||
.. path /etc/nova/nova.conf
|
||||
.. code-block:: ini
|
||||
|
||||
[DEFAULT]
|
||||
# ...
|
||||
enabled_apis = osapi_compute,metadata
|
||||
|
||||
* In the ``[DEFAULT]`` section, configure ``RabbitMQ`` message queue access:
|
||||
|
||||
.. path /etc/nova/nova.conf
|
||||
|
@ -191,16 +191,6 @@ Install and configure components
|
||||
|
||||
#. Edit the ``/etc/nova/nova.conf`` file and complete the following actions:
|
||||
|
||||
* In the ``[DEFAULT]`` section, enable only the compute and metadata
|
||||
APIs:
|
||||
|
||||
.. path /etc/nova/nova.conf
|
||||
.. code-block:: ini
|
||||
|
||||
[DEFAULT]
|
||||
# ...
|
||||
enabled_apis = osapi_compute,metadata
|
||||
|
||||
* In the ``[api_database]`` and ``[database]`` sections, configure database
|
||||
access:
|
||||
|
||||
|
@ -179,15 +179,6 @@ Install and configure components
|
||||
|
||||
#. Edit the ``/etc/nova/nova.conf`` file and complete the following actions:
|
||||
|
||||
* In the ``[DEFAULT]`` section, enable only the compute and metadata APIs:
|
||||
|
||||
.. path /etc/nova/nova.conf
|
||||
.. code-block:: ini
|
||||
|
||||
[DEFAULT]
|
||||
# ...
|
||||
enabled_apis = osapi_compute,metadata
|
||||
|
||||
* In the ``[api_database]`` and ``[database]`` sections, configure database
|
||||
access:
|
||||
|
||||
|
@ -79,85 +79,6 @@ Possible Values:
|
||||
|
||||
* Any positive integer (in seconds)
|
||||
* 0 : disable the random delay
|
||||
"""),
|
||||
cfg.ListOpt('enabled_apis',
|
||||
item_type=cfg.types.String(choices=['osapi_compute',
|
||||
'metadata']),
|
||||
default=['osapi_compute', 'metadata'],
|
||||
help="List of APIs to be enabled by default."),
|
||||
cfg.ListOpt('enabled_ssl_apis',
|
||||
item_type=cfg.types.String(choices=['osapi_compute',
|
||||
'metadata']),
|
||||
default=[],
|
||||
help="""
|
||||
List of APIs with enabled SSL.
|
||||
|
||||
Nova provides SSL support for the API servers. enabled_ssl_apis option
|
||||
allows configuring the SSL support.
|
||||
"""),
|
||||
cfg.StrOpt('osapi_compute_listen',
|
||||
default="0.0.0.0",
|
||||
help="""
|
||||
IP address on which the OpenStack API will listen.
|
||||
|
||||
The OpenStack API service listens on this IP address for incoming
|
||||
requests.
|
||||
"""),
|
||||
cfg.PortOpt('osapi_compute_listen_port',
|
||||
default=8774,
|
||||
help="""
|
||||
Port on which the OpenStack API will listen.
|
||||
|
||||
The OpenStack API service listens on this port number for incoming
|
||||
requests.
|
||||
"""),
|
||||
cfg.IntOpt('osapi_compute_workers',
|
||||
min=1,
|
||||
help="""
|
||||
Number of workers for OpenStack API service. The default will be the number
|
||||
of CPUs available.
|
||||
|
||||
OpenStack API services can be configured to run as multi-process (workers).
|
||||
This overcomes the problem of reduction in throughput when API request
|
||||
concurrency increases. OpenStack API service will run in the specified
|
||||
number of processes.
|
||||
|
||||
Possible Values:
|
||||
|
||||
* Any positive integer
|
||||
* None (default value)
|
||||
"""),
|
||||
cfg.StrOpt('metadata_listen',
|
||||
default="0.0.0.0",
|
||||
help="""
|
||||
IP address on which the metadata API will listen.
|
||||
|
||||
The metadata API service listens on this IP address for incoming
|
||||
requests.
|
||||
"""),
|
||||
cfg.PortOpt('metadata_listen_port',
|
||||
default=8775,
|
||||
help="""
|
||||
Port on which the metadata API will listen.
|
||||
|
||||
The metadata API service listens on this port number for incoming
|
||||
requests.
|
||||
"""),
|
||||
cfg.IntOpt('metadata_workers',
|
||||
min=1,
|
||||
help="""
|
||||
Number of workers for metadata service. If not specified the number of
|
||||
available CPUs will be used.
|
||||
|
||||
The metadata service can be configured to run as multi-process (workers).
|
||||
This overcomes the problem of reduction in throughput when API request
|
||||
concurrency increases. The metadata service will run in the specified
|
||||
number of processes.
|
||||
|
||||
Possible Values:
|
||||
|
||||
* Any positive integer
|
||||
* None (default value)
|
||||
"""),
|
||||
]
|
||||
|
||||
|
3
nova/tests/fixtures/nova.py
vendored
3
nova/tests/fixtures/nova.py
vendored
@ -1021,8 +1021,6 @@ class OSAPIFixture(fixtures.Fixture):
|
||||
service_name = 'osapi_compute'
|
||||
endpoint = 'http://%s:%s/' % (hostname, port)
|
||||
conf_overrides = {
|
||||
'osapi_compute_listen': hostname,
|
||||
'osapi_compute_listen_port': port,
|
||||
'debug': True,
|
||||
}
|
||||
self.useFixture(ConfPatcher(**conf_overrides))
|
||||
@ -1118,7 +1116,6 @@ class OSMetadataServer(fixtures.Fixture):
|
||||
service_name = 'metadata'
|
||||
endpoint = f'http://{hostname}/'
|
||||
conf_overrides = {
|
||||
'metadata_listen': hostname,
|
||||
'debug': True,
|
||||
}
|
||||
self.useFixture(ConfPatcher(**conf_overrides))
|
||||
|
Reference in New Issue
Block a user