Merge "Fix missing OctaviaClientCert* parameters"
This commit is contained in:
commit
d92e3c6876
|
@ -92,6 +92,16 @@ parameters:
|
||||||
If provided, this will create or update a file on the host
|
If provided, this will create or update a file on the host
|
||||||
with the path provided in OctaviaCaKeyFile with the key
|
with the path provided in OctaviaCaKeyFile with the key
|
||||||
data.
|
data.
|
||||||
|
OctaviaClientCertFile:
|
||||||
|
type: string
|
||||||
|
default: '/etc/octavia/certs/client.pem'
|
||||||
|
description: Octavia client certificate for amphorae.
|
||||||
|
OctaviaClientCert:
|
||||||
|
type: string
|
||||||
|
default: ''
|
||||||
|
description: Octavia client certificate data. If provided, this will create
|
||||||
|
or update a file on the host with the path provided in
|
||||||
|
OctaviaClientCertFile with the certificate data.
|
||||||
OctaviaServerCertsKeyPassphrase:
|
OctaviaServerCertsKeyPassphrase:
|
||||||
constraints:
|
constraints:
|
||||||
- length: { min: 32, max: 32}
|
- length: { min: 32, max: 32}
|
||||||
|
@ -206,6 +216,7 @@ conditions:
|
||||||
service_debug_unset: {equals : [{get_param: OctaviaDebug}, '']}
|
service_debug_unset: {equals : [{get_param: OctaviaDebug}, '']}
|
||||||
octavia_ca_cert_unset: {equals: [{get_param: OctaviaCaCert}, '']}
|
octavia_ca_cert_unset: {equals: [{get_param: OctaviaCaCert}, '']}
|
||||||
octavia_ca_key_unset: {equals: [{get_param: OctaviaCaKey}, '']}
|
octavia_ca_key_unset: {equals: [{get_param: OctaviaCaKey}, '']}
|
||||||
|
octavia_client_cert_unset: {equals: [{get_param: OctaviaClientCert}, '']}
|
||||||
octavia_topology_unset: {equals : [{get_param: OctaviaLoadBalancerTopology}, ""]}
|
octavia_topology_unset: {equals : [{get_param: OctaviaLoadBalancerTopology}, ""]}
|
||||||
enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]}
|
enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]}
|
||||||
|
|
||||||
|
@ -253,6 +264,7 @@ outputs:
|
||||||
octavia::service_auth::region_name: {get_param: KeystoneRegion}
|
octavia::service_auth::region_name: {get_param: KeystoneRegion}
|
||||||
octavia::certificates::ca_certificate: {get_param: OctaviaCaCertFile}
|
octavia::certificates::ca_certificate: {get_param: OctaviaCaCertFile}
|
||||||
octavia::certificates::ca_private_key: {get_param: OctaviaCaKeyFile}
|
octavia::certificates::ca_private_key: {get_param: OctaviaCaKeyFile}
|
||||||
|
octavia::certificates::client_cert: {get_param: OctaviaClientCertFile}
|
||||||
octavia::certificates::server_certs_key_passphrase: {get_param: OctaviaServerCertsKeyPassphrase}
|
octavia::certificates::server_certs_key_passphrase: {get_param: OctaviaServerCertsKeyPassphrase}
|
||||||
octavia::certificates::ca_private_key_passphrase: {get_param: OctaviaCaKeyPassphrase}
|
octavia::certificates::ca_private_key_passphrase: {get_param: OctaviaCaKeyPassphrase}
|
||||||
octavia::controller::amp_boot_network_list: {get_param: OctaviaAmphoraNetworkList}
|
octavia::controller::amp_boot_network_list: {get_param: OctaviaAmphoraNetworkList}
|
||||||
|
@ -291,3 +303,8 @@ outputs:
|
||||||
- octavia_ca_key_unset
|
- octavia_ca_key_unset
|
||||||
- {}
|
- {}
|
||||||
- octavia::certificates::ca_private_key_data: {get_param: OctaviaCaKey}
|
- octavia::certificates::ca_private_key_data: {get_param: OctaviaCaKey}
|
||||||
|
-
|
||||||
|
if:
|
||||||
|
- octavia_client_cert_unset
|
||||||
|
- {}
|
||||||
|
- octavia::certificates::client_cert_data: {get_param: OctaviaClientCert}
|
||||||
|
|
|
@ -146,7 +146,7 @@ parameters:
|
||||||
hidden: true
|
hidden: true
|
||||||
OctaviaClientCertFile:
|
OctaviaClientCertFile:
|
||||||
default: '/etc/octavia/certs/client.pem'
|
default: '/etc/octavia/certs/client.pem'
|
||||||
description: client certificate for amphoras
|
description: Octavia client certificate for amphorae.
|
||||||
type: string
|
type: string
|
||||||
OctaviaGenerateCerts:
|
OctaviaGenerateCerts:
|
||||||
type: boolean
|
type: boolean
|
||||||
|
|
Loading…
Reference in New Issue