Merge "[config-ref] fix nova crypto tables"

doc/config-reference/source/compute/config-options.rst

@@ -17,6 +17,7 @@ OpenStack Compute service, run
 .. include:: ../tables/nova-conductor.rst
 .. include:: ../tables/nova-configdrive.rst
 .. include:: ../tables/nova-console.rst
+.. include:: ../tables/nova-crypto.rst
 .. include:: ../tables/nova-debug.rst
 .. include:: ../tables/nova-ephemeral_storage_encryption.rst
 .. include:: ../tables/nova-fping.rst

tools/autogenerate-config-flagmappings/nova.flagmappings

@@ -414,14 +414,14 @@ cors.subdomain/allow_methods disable
 cors.subdomain/allowed_origin disable
 cors.subdomain/expose_headers disable
 cors.subdomain/max_age disable
-crypto/ca_file crypt
-crypto/ca_path crypt
-crypto/crl_file crypt
-crypto/key_file crypt
-crypto/keys_path crypt
-crypto/project_cert_subject crypt
-crypto/use_project_ca crypt
-crypto/user_cert_subject crypt
+crypto/ca_file crypto
+crypto/ca_path crypto
+crypto/crl_file crypto
+crypto/key_file crypto
+crypto/keys_path crypto
+crypto/project_cert_subject crypto
+crypto/use_project_ca crypto
+crypto/user_cert_subject crypto
 database/backend disable
 database/connection disable
 database/connection_debug disable
@@ -803,11 +803,11 @@ spice/html5proxy_port spice
 spice/keymap spice
 spice/server_listen spice
 spice/server_proxyclient_address spice
-ssl/ca_file crypt
-ssl/cert_file crypt
-ssl/ciphers crypt
-ssl/key_file crypt
-ssl/version crypt
+ssl/ca_file crypto
+ssl/cert_file crypto
+ssl/ciphers crypto
+ssl/key_file crypto
+ssl/version crypto
 trusted_computing/attestation_api_url trustedcomputing
 trusted_computing/attestation_auth_blob trustedcomputing
 trusted_computing/attestation_auth_timeout trustedcomputing

tools/autogenerate-config-flagmappings/nova.headers

@@ -6,7 +6,7 @@ barbican Barbican
 cells cell
 cloudpipe cloudpipe
 configdrive config drive
-crypt crypt
+crypto crypto
 ephemeral_storage_encryption ephemeral storage encryption
 fping fping
 hyperv HyperV