diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index d5647325a..a3e8c0d09 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -3,10 +3,6 @@ Configuration ============= -Nodepool reads its secure configuration from ``/etc/nodepool/secure.conf`` -by default. The secure file is a standard ini config file. Note that this -file is currently unused, but may be in the future. - Nodepool reads its configuration from ``/etc/nodepool/nodepool.yaml`` by default. The configuration file follows the standard YAML syntax with a number of sections defined with top level keys. For example, a diff --git a/doc/source/installation.rst b/doc/source/installation.rst index 040c748d0..e36a79f6f 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -52,13 +52,15 @@ Or install directly from a git checkout with:: Configuration ------------- -Nodepool has two required configuration files: secure.conf and -nodepool.yaml, and an optional logging configuration file logging.conf. -The secure.conf file is used to store nodepool configurations that contain -sensitive data. The nodepool.yaml files is used to store all other -configurations. +Nodepool has one required configuration file, which defaults to +``/etc/nodepool/nodepool.yaml``. This can be changed with the ``-c`` option. +The Nodepool configuration file is described in :ref:`configuration`. -The logging configuration file is in the standard python logging +Although there is support for a secure file that is used to store nodepool +configurations that contain sensitive data, this is currently not used, but +may be in the future. + +There is an optional logging configuration file, specified with the ``-l`` +option. The logging configuration file is in the standard python logging `configuration file format `_. -The Nodepool configuration file is described in :ref:`configuration`.