diff --git a/REFERENCE.md b/REFERENCE.md index 2eb373ac..cba52e43 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -31,7 +31,6 @@ * [`icingaweb2::module::reporting`](#icingaweb2--module--reporting): Installs the reporting module * [`icingaweb2::module::reporting::service`](#icingaweb2--module--reporting--service): Installs and configures the reporting scheduler. * [`icingaweb2::module::translation`](#icingaweb2--module--translation): Installs and configures the translation module. -* [`icingaweb2::module::vsphere`](#icingaweb2--module--vsphere): The vSphere module extends the Director. It provides import sources for virtual machines and physical hosts from vSphere. * [`icingaweb2::module::vspheredb`](#icingaweb2--module--vspheredb): Installs the vsphereDB plugin * [`icingaweb2::module::vspheredb::service`](#icingaweb2--module--vspheredb--service): Installs and configures the vspheredb service. * [`icingaweb2::module::x509`](#icingaweb2--module--x509): Installs the x509 module @@ -3269,71 +3268,6 @@ Enable or disable module. Default value: `'present'` -### `icingaweb2::module::vsphere` - -The vSphere module extends the Director. It provides import sources for virtual machines and physical hosts from vSphere. - -* **Note** If you want to use `git` as `install_method`, the CLI `git` command has to be installed. You can manage it yourself as package resource or declare the package name in icingaweb2 class parameter `extra_packages`. - -#### Parameters - -The following parameters are available in the `icingaweb2::module::vsphere` class: - -* [`ensure`](#-icingaweb2--module--vsphere--ensure) -* [`module_dir`](#-icingaweb2--module--vsphere--module_dir) -* [`git_repository`](#-icingaweb2--module--vsphere--git_repository) -* [`install_method`](#-icingaweb2--module--vsphere--install_method) -* [`package_name`](#-icingaweb2--module--vsphere--package_name) -* [`git_revision`](#-icingaweb2--module--vsphere--git_revision) - -##### `ensure` - -Data type: `Enum['absent', 'present']` - -Enable or disable module. - -Default value: `'present'` - -##### `module_dir` - -Data type: `Optional[Stdlib::Absolutepath]` - -Target directory of the module. - -Default value: `undef` - -##### `git_repository` - -Data type: `String` - -Set a git repository URL. - -Default value: `'https://github.com/Icinga/icingaweb2-module-vsphere.git'` - -##### `install_method` - -Data type: `Enum['git', 'none', 'package']` - -Install methods are `git`, `package` and `none` is supported as installation method. - -Default value: `'git'` - -##### `package_name` - -Data type: `String` - -Package name of the module. This setting is only valid in combination with the installation method `package`. - -Default value: `'icingaweb2-module-vsphere'` - -##### `git_revision` - -Data type: `Optional[String]` - -Set either a branch or a tag name, eg. `stable/0.7.0` or `v0.7.0`. - -Default value: `undef` - ### `icingaweb2::module::vspheredb` Installs the vsphereDB plugin diff --git a/manifests/module/vsphere.pp b/manifests/module/vsphere.pp deleted file mode 100644 index 0ebf00c0..00000000 --- a/manifests/module/vsphere.pp +++ /dev/null @@ -1,46 +0,0 @@ -# @summary -# The vSphere module extends the Director. It provides import sources for virtual machines and physical hosts from vSphere. -# -# @note If you want to use `git` as `install_method`, the CLI `git` command has to be installed. You can manage it yourself as package resource or declare the package name in icingaweb2 class parameter `extra_packages`. -# -# @param ensure -# Enable or disable module. -# -# @param module_dir -# Target directory of the module. -# -# @param git_repository -# Set a git repository URL. -# -# @param install_method -# Install methods are `git`, `package` and `none` is supported as installation method. -# -# @param package_name -# Package name of the module. This setting is only valid in combination with the installation method `package`. -# -# @param git_revision -# Set either a branch or a tag name, eg. `stable/0.7.0` or `v0.7.0`. -# -# @note Check out the [vSphere module documentation](https://www.icinga.com/docs/director/latest/vsphere/doc/). -# -class icingaweb2::module::vsphere ( - Enum['absent', 'present'] $ensure = 'present', - Optional[Stdlib::Absolutepath] $module_dir = undef, - String $git_repository = 'https://github.com/Icinga/icingaweb2-module-vsphere.git', - Optional[String] $git_revision = undef, - Enum['git', 'none', 'package'] $install_method = 'git', - String $package_name = 'icingaweb2-module-vsphere', -) { - icingaweb2::assert_module() - - deprecation('icingaweb2::module::vsphere', 'icingaweb2::module::vsphere is deprecated and was replaced by icingaweb2::module::vspheredb.') - - icingaweb2::module { 'vsphere': - ensure => $ensure, - git_repository => $git_repository, - git_revision => $git_revision, - install_method => $install_method, - module_dir => $module_dir, - package_name => $package_name, - } -} diff --git a/spec/classes/vsphere_spec.rb b/spec/classes/vsphere_spec.rb deleted file mode 100644 index e84127ac..00000000 --- a/spec/classes/vsphere_spec.rb +++ /dev/null @@ -1,27 +0,0 @@ -require 'spec_helper' - -describe('icingaweb2::module::vsphere', type: :class) do - let(:pre_condition) do - [ - "class { 'icingaweb2': db_type => 'mysql', db_password => 'secret' }", - ] - end - - on_supported_os.each do |os, facts| - context "on #{os}" do - let :facts do - facts - end - - context "#{os} with git_revision 'v1.1.0'" do - let(:params) { { git_revision: 'v1.1.0' } } - - it { - is_expected.to contain_icingaweb2__module('vsphere') - .with_install_method('git') - .with_git_revision('v1.1.0') - } - end - end - end -end