diff options
| -rw-r--r-- | manifests/certmonger/haproxy.pp | 15 | ||||
| -rw-r--r-- | manifests/haproxy.pp | 4 | ||||
| -rw-r--r-- | manifests/profile/base/docker.pp | 20 | ||||
| -rw-r--r-- | manifests/profile/base/manila/api.pp | 11 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/cinder/backup_bundle.pp | 5 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/cinder/volume_bundle.pp | 5 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/manila.pp | 45 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/manila/share_bundle.pp | 5 | ||||
| -rw-r--r-- | releasenotes/notes/isilon_driver_bfa347d073cd11e7.yaml | 4 | ||||
| -rw-r--r-- | releasenotes/notes/unity_driver_afa347d073cd11e7.yaml | 4 | ||||
| -rw-r--r-- | releasenotes/source/conf.py | 4 | ||||
| -rw-r--r-- | spec/classes/tripleo_profile_base_docker_spec.rb | 24 |
12 files changed, 132 insertions, 14 deletions
diff --git a/manifests/certmonger/haproxy.pp b/manifests/certmonger/haproxy.pp index 819348d..97efe59 100644 --- a/manifests/certmonger/haproxy.pp +++ b/manifests/certmonger/haproxy.pp @@ -74,7 +74,20 @@ define tripleo::certmonger::haproxy ( $dnsnames_real = $hostname } - $postsave_cmd_real = pick($postsave_cmd, 'systemctl reload haproxy') + if $certmonger_ca == 'local' { + $ca_fragment = $ca_pem + } else { + $ca_fragment = '' + } + + $concat_pem = "cat ${service_certificate} ${ca_fragment} ${service_key} > ${service_pem}" + if $postsave_cmd { + $postsave_cmd_real = "${concat_pem} && ${postsave_cmd}" + } else { + $reload_haproxy_cmd = 'if systemctl -q is-active haproxy; then systemctl reload haproxy; else true; fi' + $postsave_cmd_real = "${concat_pem} && ${reload_haproxy_cmd}" + } + certmonger_certificate { "${title}-cert": ensure => 'present', ca => $certmonger_ca, diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index 9939ca9..e41f0e6 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -539,7 +539,7 @@ # 'nova_novnc_ssl_port' (Defaults to 13080) # 'opendaylight_api_port' (Defaults to 8081) # 'panko_api_port' (Defaults to 8977) -# 'panko_api_ssl_port' (Defaults to 13779) +# 'panko_api_ssl_port' (Defaults to 13977) # 'ovn_nbdb_port' (Defaults to 6641) # 'ovn_sbdb_port' (Defaults to 6642) # 'sahara_api_port' (Defaults to 8386) @@ -728,7 +728,7 @@ class tripleo::haproxy ( nova_novnc_ssl_port => 13080, opendaylight_api_port => 8081, panko_api_port => 8977, - panko_api_ssl_port => 13779, + panko_api_ssl_port => 13977, ovn_nbdb_port => 6641, ovn_sbdb_port => 6642, ec2_api_port => 8788, diff --git a/manifests/profile/base/docker.pp b/manifests/profile/base/docker.pp index 8cb4cdd..73731ad 100644 --- a/manifests/profile/base/docker.pp +++ b/manifests/profile/base/docker.pp @@ -44,6 +44,10 @@ # [*step*] # step defaults to hiera('step') # +# [*debug*] +# Boolean. Value to configure docker daemon's debug configuration. +# Defaults to false +# # DEPRECATED PARAMETERS # # [*insecure_registry_address*] @@ -62,11 +66,12 @@ # class tripleo::profile::base::docker ( $insecure_registries = undef, - $registry_mirror = false, - $docker_options = '--log-driver=journald --signature-verification=false --iptables=false', - $configure_storage = true, - $storage_options = '-s overlay2', - $step = Integer(hiera('step')), + $registry_mirror = false, + $docker_options = '--log-driver=journald --signature-verification=false --iptables=false', + $configure_storage = true, + $storage_options = '-s overlay2', + $step = Integer(hiera('step')), + $debug = false, # DEPRECATED PARAMETERS $insecure_registry_address = undef, $docker_namespace = undef, @@ -133,6 +138,9 @@ class tripleo::profile::base::docker ( $mirror_changes = [ 'rm dict/entry[. = "registry-mirrors"]', ] } + $debug_changes = ['set dict/entry[. = "debug"] "debug"', + "set dict/entry[. = \"debug\"]/const \"${debug}\"",] + file { '/etc/docker/daemon.json': ensure => 'present', content => '{}', @@ -144,7 +152,7 @@ class tripleo::profile::base::docker ( augeas { 'docker-daemon.json': lens => 'Json.lns', incl => '/etc/docker/daemon.json', - changes => $mirror_changes, + changes => concat($mirror_changes, $debug_changes), subscribe => Package['docker'], notify => Service['docker'], require => File['/etc/docker/daemon.json'], diff --git a/manifests/profile/base/manila/api.pp b/manifests/profile/base/manila/api.pp index 25c3890..a86c5b2 100644 --- a/manifests/profile/base/manila/api.pp +++ b/manifests/profile/base/manila/api.pp @@ -29,6 +29,13 @@ # [*backend_vmax_enabled*] # (Optional) Whether or not the vmax backend is enabled # Defaults to hiera('manila_backend_vmax_enabled', false) +# [*backend_isilon_enabled*] +# (Optional) Whether or not the isilon backend is enabled +# Defaults to hiera('manila_backend_isilon_enabled', false) +# +# [*backend_unity_enabled*] +# (Optional) Whether or not the unity backend is enabled +# Defaults to hiera('manila_backend_unity_enabled', false) # # [*backend_cephfs_enabled*] # (Optional) Whether or not the cephfs backend is enabled @@ -47,6 +54,8 @@ class tripleo::profile::base::manila::api ( $backend_generic_enabled = hiera('manila_backend_generic_enabled', false), $backend_netapp_enabled = hiera('manila_backend_netapp_enabled', false), $backend_vmax_enabled = hiera('manila_backend_vmax_enabled', false), + $backend_isilon_enabled = hiera('manila_backend_isilon_enabled', false), + $backend_unity_enabled = hiera('manila_backend_unity_enabled', false), $backend_cephfs_enabled = hiera('manila_backend_cephfs_enabled', false), $bootstrap_node = hiera('bootstrap_nodeid', undef), $step = Integer(hiera('step')), @@ -60,7 +69,7 @@ class tripleo::profile::base::manila::api ( include ::tripleo::profile::base::manila if $step >= 4 or ($step >= 3 and $sync_db) { - if $backend_generic_enabled or $backend_netapp_enabled or $backend_vmax_enabled { + if $backend_generic_enabled or $backend_netapp_enabled or $backend_vmax_enabled or $backend_isilon_enabled or $backend_unity_enabled { $nfs_protocol = 'NFS' $cifs_protocol = 'CIFS' } else { diff --git a/manifests/profile/pacemaker/cinder/backup_bundle.pp b/manifests/profile/pacemaker/cinder/backup_bundle.pp index 2a82c3e..9c897af 100644 --- a/manifests/profile/pacemaker/cinder/backup_bundle.pp +++ b/manifests/profile/pacemaker/cinder/backup_bundle.pp @@ -134,6 +134,11 @@ class tripleo::profile::pacemaker::cinder::backup_bundle ( 'target-dir' => '/var/log/cinder', 'options' => 'rw', }, + 'ceph-cfg-dir' => { + 'source-dir' => '/etc/ceph', + 'target-dir' => '/etc/ceph', + 'options' => 'ro', + }, }, } } diff --git a/manifests/profile/pacemaker/cinder/volume_bundle.pp b/manifests/profile/pacemaker/cinder/volume_bundle.pp index 8d58036..2b0411f 100644 --- a/manifests/profile/pacemaker/cinder/volume_bundle.pp +++ b/manifests/profile/pacemaker/cinder/volume_bundle.pp @@ -134,6 +134,11 @@ class tripleo::profile::pacemaker::cinder::volume_bundle ( 'target-dir' => '/var/log/cinder', 'options' => 'rw', }, + 'ceph-cfg-dir' => { + 'source-dir' => '/etc/ceph', + 'target-dir' => '/etc/ceph', + 'options' => 'ro', + }, }, } } diff --git a/manifests/profile/pacemaker/manila.pp b/manifests/profile/pacemaker/manila.pp index 3fb4e0b..d21c9c4 100644 --- a/manifests/profile/pacemaker/manila.pp +++ b/manifests/profile/pacemaker/manila.pp @@ -30,6 +30,14 @@ # (Optional) Whether or not the vmax backend is enabled # Defaults to hiera('manila_backend_vmax_enabled', false) # +# [*backend_isilon_enabled*] +# (Optional) Whether or not the isilon backend is enabled +# Defaults to hiera('manila_backend_isilon_enabled', false) +# +# [*backend_unity_enabled*] +# (Optional) Whether or not the unity backend is enabled +# Defaults to hiera('manila_backend_unity_enabled', false) +# # [*backend_cephfs_enabled*] # (Optional) Whether or not the cephfs backend is enabled # Defaults to hiera('manila_backend_cephfs_enabled', false) @@ -51,6 +59,8 @@ class tripleo::profile::pacemaker::manila ( $backend_generic_enabled = hiera('manila_backend_generic_enabled', false), $backend_netapp_enabled = hiera('manila_backend_netapp_enabled', false), $backend_vmax_enabled = hiera('manila_backend_vmax_enabled', false), + $backend_isilon_enabled = hiera('manila_backend_isilon_enabled', false), + $backend_unity_enabled = hiera('manila_backend_unity_enabled', false), $backend_cephfs_enabled = hiera('manila_backend_cephfs_enabled', false), $bootstrap_node = hiera('manila_share_short_bootstrap_node_name'), $step = Integer(hiera('step')), @@ -171,15 +181,48 @@ class tripleo::profile::pacemaker::manila ( vmax_ethernet_ports => hiera('manila::backend::dellemc_vmax::vmax_ethernet_ports'), } } + # manila unity: + if $backend_unity_enabled { + $manila_unity_backend = hiera('manila::backend::dellemc_unity::title') + manila::backend::dellemc_unity { $manila_unity_backend : + driver_handles_share_servers => hiera('manila::backend::dellemc_unity::driver_handles_share_servers', true), + emc_nas_login => hiera('manila::backend::dellemc_unity::emc_nas_login'), + emc_nas_password => hiera('manila::backend::dellemc_unity::emc_nas_password'), + emc_nas_server => hiera('manila::backend::dellemc_unity::emc_nas_server'), + emc_share_backend => hiera('manila::backend::dellemc_unity::emc_share_backend','unity'), + share_backend_name => hiera('manila::backend::dellemc_unity::share_backend_name'), + unity_server_meta_pool => hiera('manila::backend::dellemc_unity::unity_server_meta_pool'), + unity_share_data_pools => hiera('manila::backend::dellemc_unity::unity_share_data_pools'), + unity_ethernet_ports => hiera('manila::backend::dellemc_unity::unity_ethernet_ports'), + } + } + # manila isilon: + if $backend_isilon_enabled { + $manila_isilon_backend = hiera('manila::backend::dellemc_isilon::title') + manila::backend::dellemc_isilon { $manila_isilon_backend : + driver_handles_share_servers => hiera('manila::backend::dellemc_isilon::driver_handles_share_servers', false), + emc_nas_login => hiera('manila::backend::dellemc_isilon::emc_nas_login'), + emc_nas_password => hiera('manila::backend::dellemc_isilon::emc_nas_password'), + emc_nas_server => hiera('manila::backend::dellemc_isilon::emc_nas_server'), + emc_share_backend => hiera('manila::backend::dellemc_isilon::emc_share_backend','isilon'), + share_backend_name => hiera('manila::backend::dellemc_isilon::share_backend_name'), + emc_nas_root_dir => hiera('manila::backend::dellemc_isilon::emc_nas_root_dir'), + emc_nas_server_port => hiera('manila::backend::dellemc_isilon::emc_server_port'), + emc_nas_server_secure => hiera('manila::backend::dellemc_isilon::emc_nas_secure'), + } + } + $manila_enabled_backends = delete_undef_values( [ $manila_generic_backend, $manila_cephfsnative_backend, $manila_netapp_backend, - $manila_vmax_backend + $manila_vmax_backend, + $manila_isilon_backend, + $manila_unity_backend ] ) class { '::manila::backends' : diff --git a/manifests/profile/pacemaker/manila/share_bundle.pp b/manifests/profile/pacemaker/manila/share_bundle.pp index 0e6c60c..0893bf0 100644 --- a/manifests/profile/pacemaker/manila/share_bundle.pp +++ b/manifests/profile/pacemaker/manila/share_bundle.pp @@ -129,6 +129,11 @@ class tripleo::profile::pacemaker::manila::share_bundle ( 'target-dir' => '/var/log/manila', 'options' => 'rw', }, + 'ceph-cfg-dir' => { + 'source-dir' => '/etc/ceph', + 'target-dir' => '/etc/ceph', + 'options' => 'ro', + }, }, } } diff --git a/releasenotes/notes/isilon_driver_bfa347d073cd11e7.yaml b/releasenotes/notes/isilon_driver_bfa347d073cd11e7.yaml new file mode 100644 index 0000000..e6dad75 --- /dev/null +++ b/releasenotes/notes/isilon_driver_bfa347d073cd11e7.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Add support to configure Dell EMC Isilon backend diff --git a/releasenotes/notes/unity_driver_afa347d073cd11e7.yaml b/releasenotes/notes/unity_driver_afa347d073cd11e7.yaml new file mode 100644 index 0000000..09f0fa6 --- /dev/null +++ b/releasenotes/notes/unity_driver_afa347d073cd11e7.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Add support to configure Dell EMC Unity backend diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 7224ef2..415536f 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -53,9 +53,9 @@ copyright = u'2017, Puppet TripleO Developers' # built documents. # # The short X.Y version. -version = '7.3.0' +version = '' # The full version, including alpha/beta/rc tags. -release = '7.3.0' +release = '' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/spec/classes/tripleo_profile_base_docker_spec.rb b/spec/classes/tripleo_profile_base_docker_spec.rb index 146d784..328948e 100644 --- a/spec/classes/tripleo_profile_base_docker_spec.rb +++ b/spec/classes/tripleo_profile_base_docker_spec.rb @@ -82,10 +82,32 @@ describe 'tripleo::profile::base::docker' do it { is_expected.to contain_package('docker') } it { is_expected.to contain_service('docker') } it { - is_expected.to contain_augeas('docker-daemon.json').with_changes(['set dict/entry[. = "registry-mirrors"] "registry-mirrors', "set dict/entry[. = \"registry-mirrors\"]/array/string \"http://foo/bar\""]) + is_expected.to contain_augeas('docker-daemon.json').with_changes( + ['set dict/entry[. = "registry-mirrors"] "registry-mirrors', + "set dict/entry[. = \"registry-mirrors\"]/array/string \"http://foo/bar\"", + 'set dict/entry[. = "debug"] "debug"', + "set dict/entry[. = \"debug\"]/const \"false\""]) } end + context 'with step 1 and docker debug' do + let(:params) { { + :step => 1, + :debug => true, + } } + + it { is_expected.to contain_class('tripleo::profile::base::docker') } + it { is_expected.to contain_package('docker') } + it { is_expected.to contain_service('docker') } + it { + is_expected.to contain_augeas('docker-daemon.json').with_changes( + ['rm dict/entry[. = "registry-mirrors"]', + 'set dict/entry[. = "debug"] "debug"', + "set dict/entry[. = \"debug\"]/const \"true\""]) + } + end + + context 'with step 1 and docker_options configured' do let(:params) { { :docker_options => '--log-driver=syslog', |