diff --git a/manifests/init.pp b/manifests/init.pp index b961a38c3..093531a4a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -206,10 +206,18 @@ # 'key-data' }, where 'key-type' is one of (ssh-rsa, ssh-dsa, ssh-ecdsa, # ssh-ed25519) and 'key-data' is the contents of the private key file. # +# [*record*] +# (optional) Filename that will be used for storing websocket frames. +# Defaults to $facts['os_service_default'] +# # [*ssl_only*] # (optional) Disallow non-encrypted connections. # Defaults to $facts['os_service_default'] # +# [*source_is_ipv6*] +# (optional) Set to True if source host is addressed with IPv6. +# Defaults to $facts['os_service_default'] +# # [*cert*] # (optional) Path to SSL certificate file. # Defaults to $facts['os_service_default'] @@ -376,7 +384,9 @@ class nova( $key_file = undef, Optional[Nova::SshKey] $nova_public_key = undef, Optional[Nova::SshKey] $nova_private_key = undef, + $record = $facts['os_service_default'], $ssl_only = $facts['os_service_default'], + $source_is_ipv6 = $facts['os_service_default'], $cert = $facts['os_service_default'], $key = $facts['os_service_default'], $console_ssl_ciphers = $facts['os_service_default'], @@ -480,7 +490,9 @@ class nova( } nova_config { + 'DEFAULT/record': value => $record; 'DEFAULT/ssl_only': value => $ssl_only; + 'DEFAULT/source_is_ipv6': value => $source_is_ipv6; 'DEFAULT/cert': value => $cert; 'DEFAULT/key': value => $key; 'console/ssl_ciphers': value => join(any2array($console_ssl_ciphers), ':'); diff --git a/releasenotes/notes/novnc-opts-877778502b8db25d.yaml b/releasenotes/notes/novnc-opts-877778502b8db25d.yaml new file mode 100644 index 000000000..d242f3217 --- /dev/null +++ b/releasenotes/notes/novnc-opts-877778502b8db25d.yaml @@ -0,0 +1,7 @@ +--- +features: + - | + The following parameters have been added to the ``nova`` class. + + - ``record`` + - ``source_is_ipv6`` diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb index ae32a1879..0a0a78af1 100644 --- a/spec/classes/nova_init_spec.rb +++ b/spec/classes/nova_init_spec.rb @@ -86,7 +86,9 @@ describe 'nova' do is_expected.to contain_nova_config('DEFAULT/initial_cpu_allocation_ratio').with_value('') is_expected.to contain_nova_config('DEFAULT/initial_ram_allocation_ratio').with_value('') is_expected.to contain_nova_config('DEFAULT/initial_disk_allocation_ratio').with_value('') + is_expected.to contain_nova_config('DEFAULT/record').with_value('') is_expected.to contain_nova_config('DEFAULT/ssl_only').with_value('') + is_expected.to contain_nova_config('DEFAULT/source_is_ipv6').with_value('') is_expected.to contain_nova_config('DEFAULT/cert').with_value('') is_expected.to contain_nova_config('DEFAULT/key').with_value('') is_expected.to contain_nova_config('console/ssl_ciphers').with_value('') @@ -145,7 +147,9 @@ describe 'nova' do :upgrade_level_scheduler => '1.0.0', :purge_config => false, :my_ip => '192.0.2.1', + :record => '/var/lib/nova/novnc.log', :ssl_only => true, + :source_is_ipv6 => false, :cert => '/etc/ssl/private/snakeoil.pem', :key => '/etc/ssl/certs/snakeoil.pem', :console_ssl_ciphers => 'kEECDH+aECDSA+AES:kEECDH+AES+aRSA:kEDH+aRSA+AES', @@ -235,7 +239,9 @@ describe 'nova' do is_expected.to contain_nova_config('DEFAULT/periodic_fuzzy_delay').with_value('61') is_expected.to contain_nova_config('vif_plug_ovs/ovsdb_connection').with_value('tcp:127.0.0.1:6640') is_expected.to contain_nova_config('DEFAULT/long_rpc_timeout').with_value('1800') + is_expected.to contain_nova_config('DEFAULT/record').with_value('/var/lib/nova/novnc.log') is_expected.to contain_nova_config('DEFAULT/ssl_only').with_value(true) + is_expected.to contain_nova_config('DEFAULT/source_is_ipv6').with_value(false) is_expected.to contain_nova_config('DEFAULT/cert').with_value('/etc/ssl/private/snakeoil.pem') is_expected.to contain_nova_config('DEFAULT/key').with_value('/etc/ssl/certs/snakeoil.pem') is_expected.to contain_nova_config('console/ssl_ciphers').with_value('kEECDH+aECDSA+AES:kEECDH+AES+aRSA:kEDH+aRSA+AES')