From: Morgan Haskel Date: Wed, 25 Mar 2015 22:32:09 +0000 (-0400) Subject: Merge remote-tracking branch 'upstream/master' into merge_master_to_next X-Git-Tag: 2.0.0~10^2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=dc746734f17faa996e8441d176143945e8347330;p=puppet-modules%2Fpuppetlabs-apt.git Merge remote-tracking branch 'upstream/master' into merge_master_to_next --- dc746734f17faa996e8441d176143945e8347330 diff --cc README.md index 5097fff,3fd74b3..26feda3 --- a/README.md +++ b/README.md @@@ -51,10 -90,10 +51,10 @@@ class { 'apt': A native Puppet type and provider for managing GPG keys for Apt is provided by this module. - ``` + ```puppet apt_key { 'puppetlabs': ensure => 'present', - id => '1054B7A24BD6EC30', + id => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30', } ``` @@@ -67,19 -108,62 +67,19 @@@ ### Defined Types -* `apt::builddep`: Installs the build dependencies of a specified package. - - `apt::builddep { 'glusterfs-server': }` - * `apt::conf`: Specifies a custom configuration file. The priority defaults to 50, but you can set the priority parameter to load the file earlier or later. The content parameter passes specified content, if any, into the file resource. - * `apt::key`: Adds a key to the list of keys used by Apt to authenticate packages. This type uses the aforementioned `apt_key` native type. As such, it no longer requires the `wget` command on which the old implementation depended. -* `apt::hold`: Holds a specific version of a package. You can hold a package to a full version or a partial version. - - To set a package's ensure attribute to 'latest' but get the version specified by `apt::hold`: - - ``` - apt::hold { 'vim': - version => '2:7.3.547-7', - } - ``` - - Alternatively, if you want to hold your package at a partial version, you can use a wildcard. For example, you can hold Vim at version 7.3.*: - - - ``` - apt::hold { 'vim': - version => '2:7.3.*', - } - ``` - -* `apt::force`: Forces a package to be installed from a specific release. This is particularly useful when using repositories that are unstable in Ubuntu, such as Debian. - - ``` - apt::force { 'glusterfs-server': - release => 'unstable', - version => '3.0.3', - cfg_files => 'unchanged', - cfg_missing => true, - require => Apt::Source['debian_unstable'], - } - ``` ++* `apt::key`: Adds a key to the list of keys used by Apt to authenticate packages. This type uses the aforementioned `apt\_key` native type. As such, it no longer requires the `wget` command on which the old implementation depended. - Valid values for `cfg_files` are: - * 'new': Overwrites all existing configuration files with newer ones. - * 'old': Forces usage of all old files. - * 'unchanged: Updates only unchanged config files. - * 'none': Provides backward-compatibility with existing Puppet manifests. - - Valid values for `cfg_missing` are 'true', 'false'. Setting this to 'false' provides backward compatibility; setting it to 'true' checks for and installs missing configuration files for the selected package. - -* `apt::key`: Adds a key to the list of keys used by Apt to authenticate packages. This type uses the aforementioned `apt_key` native type. As such, it no longer requires the `wget` command on which the old implementation depended. - - ``` + ```puppet apt::key { 'puppetlabs': - id => '1054B7A24BD6EC30', - key => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30', - key_server => 'pgp.mit.edu', ++ id => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30', + server => 'pgp.mit.edu', } apt::key { 'jenkins': - id => '9B7D32F2D50582E6', - key => '150FDE3F7787E7D11EF4E12A9B7D32F2D50582E6', - key_source => 'http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key', ++ id => '150FDE3F7787E7D11EF4E12A9B7D32F2D50582E6', + source => 'http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key', } ``` @@@ -107,48 -191,42 +107,48 @@@ * `apt::ppa`: Adds a PPA repository using `add-apt-repository`. For example, `apt::ppa { 'ppa:drizzle-developers/ppa': }`. +* `apt::setting`: Defined type to abstract the creation of Apt configuration files. + * `apt::source`: Adds an Apt source to `/etc/apt/sources.list.d/`. For example: - ``` + ```puppet apt::source { 'debian_unstable': - comment => 'This is the iWeb Debian unstable mirror', - location => 'http://debian.mirror.iweb.ca/debian/', - release => 'unstable', - repos => 'main contrib non-free', - required_packages => 'debian-keyring debian-archive-keyring', - key => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553', - key_server => 'subkeys.pgp.net', - pin => '-10', - include_src => true, - include_deb => true + comment => 'This is the iWeb Debian unstable mirror', + location => 'http://debian.mirror.iweb.ca/debian/', + release => 'unstable', + repos => 'main contrib non-free', + pin => '-10', + key => { - 'id' => '8B48AD6246925553', ++ 'id' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553', + 'server' => 'subkeys.pgp.net', + }, + include => { + 'src' => true, + 'deb' => true, + }, } ``` For example, to configure your system so the source is the Puppet Labs Apt repository: - ``` + ```puppet apt::source { 'puppetlabs': - location => 'http://apt.puppetlabs.com', - repos => 'main dependencies', - key => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30', - key_server => 'pgp.mit.edu', - } + location => 'http://apt.puppetlabs.com', + repos => 'main', + key => { - 'id' => '1054B7A24BD6EC30', ++ 'id' => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30', + 'server' => 'pgp.mit.edu', + }, ``` ### Facts The apt module includes a few facts to describe the state of the Apt system: --* `apt_updates`: The number of updates available on the system --* `apt_security_updates`: The number of updates which are security updates --* `apt_package_updates`: The package names that are available for update. In Facter 2.0 and later, this will be a list type; in earlier versions, it is a comma-delimited string. --* `apt_update_last_success`: The date, in epochtime, of the most recent successful `apt-get update` run. This is determined by reading the mtime of /var/lib/apt/periodic/update-success-stamp. ++* `apt\_updates`: The number of updates available on the system ++* `apt\_security\_updates`: The number of updates which are security updates ++* `apt\_package\_updates`: The package names that are available for update. In Facter 2.0 and later, this will be a list type; in earlier versions, it is a comma-delimited string. ++* `apt\_update\_last\_success`: The date, in epochtime, of the most recent successful `apt-get update` run. This is determined by reading the mtime of /var/lib/apt/periodic/update-success-stamp. **Note:** The facts depend on 'update-notifier' being installed on your system. Though this is a GNOME daemon only the support files are needed so the package 'update-notifier-common' is enough to enable this functionality. @@@ -170,43 -248,68 +170,43 @@@ apt::sources 'puppetlabs': location: 'http://apt.puppetlabs.com' - repos: 'main dependencies' - key: '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30' - key_server: 'pgp.mit.edu' - + repos: 'main' + key: - id:'1054B7A24BD6EC30' ++ id: '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30' + server: 'pgp.mit.edu' ``` ### Parameters #### apt -* `always_apt_update`: Set to 'true' to update Apt on every run. This setting is intended for development environments where package updates are frequent. Defaults to 'false'. -* `apt_update_frequency`: Sets the run frequency for `apt-get update`. Defaults to 'reluctantly'. Accepts the following values: - * 'always': Runs update at every Puppet run. - * 'daily': Runs update daily; that is, `apt-get update` runs if the value of `apt_update_last_success` is less than current epoch time - 86400. If the exec resource `apt_update` is notified, `apt-get update` runs regardless of this value. - * 'weekly': Runs update weekly; that is, `apt-get update` runs if the value of `apt_update_last_success` is less than current epoch time - 604800. If the exec resource `apt_update` is notified, `apt-get update` runs regardless of this value. - * 'reluctantly': Only runs `apt-get update` if the exec resource `apt_update` is notified. This is the default setting. -* `disable_keys`: Disables the requirement for all packages to be signed. -* `proxy_host`: Configures a proxy host and stores the configuration in /etc/apt/apt.conf.d/01proxy. -* `proxy_port`: Configures a proxy port and stores the configuration in /etc/apt/apt.conf.d/01proxy. -* `purge_sources_list`: If set to 'true', Puppet purges all unmanaged entries from sources.list. Accepts 'true' or 'false'. Defaults to 'false'. -* `purge_sources_list_d`: If set to 'true', Puppet purges all unmanaged entries from sources.list.d. Accepts 'true' or 'false'. Defaults to 'false'. -* `update_timeout`: Overrides the exec timeout in seconds for `apt-get update`. Defaults to exec default (300). -* `update_tries`: Sets how many times to attempt running `apt-get update`. Use this to work around transient DNS and HTTP errors. By default, the command runs only once. -* `sources`: Passes a hash to create_resource to make new `apt::source` resources. -* `fancy_progress`: Enables fancy progress bars for apt. Accepts 'true', 'false'. Defaults to 'false'. - -####apt::unattended_upgrades - -* `legacy_origin`: If set to true, use the old `Unattended-Upgrade::Allowed-Origins` variable. If false, use `Unattended-Upgrade::Origins-Pattern`. OS-dependent defaults are defined in `apt::params`. -* `origins`: The repositories from which to automatically upgrade included packages. OS-dependent defaults are defined in `apt::params`. (Usually only security updates are enabled by default) -* `blacklist`: A list of packages to **not** automatically upgrade. This list is empty by default. -* `update`: How often, in days, to run `apt-get update`. Defaults to '1'. -* `download`: How often, in days, to run `apt-get upgrade --download-only`. Defaults to '1'. -* `upgrade`: How often, in days, to upgrade packages included in the origins list. Defaults to '1'. -* `autoclean`: How often, in days, to run `apt-get autoclean`. Defaults to '7'. -* `auto_fix`: Tries to automatically fix interrupted package installations. Defaults to 'true'. -* `minimal_steps`: Split the upgrade process into sections to allow shutdown during upgrade. Defaults to 'false'. -* `install_on_shutdown`: Install updates on shutdown instead of in the background. Defaults to 'false'. -* `mail_to`: Send e-mail to this address about packages upgrades or errors. This is not set by default. -* `mail_only_on_error`: Send e-mail only in case of error, not on successful upgrade. Defaults to 'false'. -* `remove_unused`: Removes unused dependencies. Defaults to 'true'. -* `auto_reboot`: Reboot the system **without confirmation** if an update requires rebooting. Defaults to 'false'. -* `dl_limit`: Use a bandwidth limit for downloading, specified in kb/sec. This is not set by default. -* `randomsleep`: How long, in seconds, to randomly wait before applying upgrades. This is not set by default. - -####apt::source - -* `comment`: Add a comment to the apt source file. -* `ensure`: Allows you to remove the apt source file. Can be 'present' or 'absent'. -* `location`: The URL of the apt repository. -* `release`: The distribution of the apt repository. Defaults to fact 'lsbdistcodename'. -* `repos`: The component of the apt repository. This defaults to 'main'. -* `include_deb`: References a Debian distribution's binary package. -* `include_src`: Enable the deb-src type, references a Debian distribution's source code in the same form as the include_deb type. A deb-src line is required to fetch source indexes. -* `required_packages`: install required packages via an exec. defaults to 'false'. -* `key`: See apt::key -* `key_server`: See apt::key -* `key_content`: See apt::key -* `key_source`: See apt::key -* `pin`: See apt::pin -* `architecture`: can be used to specify for which architectures information should be downloaded. If this option is not set all architectures defined by the APT::Architectures option will be downloaded. Defaults to 'undef' which means all. Example values can be 'i386' or 'i386,alpha,powerpc'. -* `trusted_source` can be set to indicate that packages from this source are always authenticated even if the Release file is not signed or the signature can't be checked. Defaults to false. Can be 'true' or 'false'. +* `update`: Hash to configure various update settings. Valid keys are: + * 'frequency': The run frequency for `apt-get update`. Defaults to 'reluctantly'. Accepts the following values: + * 'always': Runs update at every Puppet run. - * 'daily': Runs update daily; that is, `apt-get update` runs if the value of `apt_update_last_success` is less than current epoch time - 86400. If the exec resource `apt_update` is notified, `apt-get update` runs regardless of this value. - * 'weekly': Runs update weekly; that is, `apt-get update` runs if the value of `apt_update_last_success` is less than current epoch time - 604800. If the exec resource `apt_update` is notified, `apt-get update` runs regardless of this value. - * 'reluctantly': Only runs `apt-get update` if the exec resource `apt_update` is notified. This is the default setting. ++ * 'daily': Runs update daily; that is, `apt-get update` runs if the value of `apt\_update\_last\_success` is less than current epoch time - 86400. If the exec resource `apt\_update` is notified, `apt-get update` runs regardless of this value. ++ * 'weekly': Runs update weekly; that is, `apt-get update` runs if the value of `apt\_update\_last\_success` is less than current epoch time - 604800. If the exec resource `apt\_update` is notified, `apt-get update` runs regardless of this value. ++ * 'reluctantly': Only runs `apt-get update` if the exec resource `apt\_update` is notified. This is the default setting. + * 'timeout': Overrides the exec timeout in seconds for `apt-get update`. Defaults to exec default (300). + * 'tries': Sets how many times to attempt running `apt-get update`. Use this to work around transient DNS and HTTP errors. By default, the command runs only once. +* `purge`: Hash to configure various purge settings. Valid keys are: + * 'sources.list': If set to 'true', Puppet purges all unmanaged entries from sources.list. Accepts `true` or `false`. Defaults to `true`. + * 'sources.list.d': If set to 'true', Puppet purges all unmanaged entries from sources.list.d. Accepts `true` or `false`. Defaults to `true`. + * 'preferences.list': If set to 'true', Puppet purges all unmanaged entries from preferences.list. Accepts `true` or `false`. Defaults to `true`. + * 'preferences.list.d': If set to 'true', Puppet purges all unmanaged entries from preferences.list.d. Accepts `true` or `false`. Defaults to `true`. +* `proxy`: Hash to configure various proxy settings. Valid keys are: + * 'host': Configures a proxy host and stores the configuration in /etc/apt/apt.conf.d/01proxy. + * 'port': Configures a proxy port and stores the configuration in /etc/apt/apt.conf.d/01proxy. + * 'https': Boolean to configure whether or not to enable https proxies. Defaults to false. - * `keys`: Passes a hash to create_resource to make new `apt::key` resources. - * `ppas`: Passes a hash to create_resource to make new `apt::ppa` resources. - * `settings`: Passes a hash to create_resource to make new `apt::setting` resources. - * `sources`: Passes a hash to create_resource to make new `apt::source` resources. ++* `keys`: Passes a hash to `create\_resource` to make new `apt::key` resources. ++* `ppas`: Passes a hash to `create\_resource` to make new `apt::ppa` resources. ++* `settings`: Passes a hash to `create\_resource` to make new `apt::setting` resources. ++* `sources`: Passes a hash to `create\_resource` to make new `apt::source` resources. + +####apt::conf + +* `content`: The content of the configuration file. +* `ensure`: Whether the configuration file should be 'present' or 'absent'. Defaults to 'present'. +* `priority`: Numeric priority for the configuration file. Defaults to '50'. ####apt::key @@@ -220,15 -323,15 +220,15 @@@ ####apt::pin * `ensure`: The state we want this pin in. Can be 'present' or 'absent'. --* `explanation`: Add a comment. Defaults to `${caller_module_name}: ${name}`. -* `order`: The order of the file name. Defaults to '', otherwise must be an integer. ++* `explanation`: Add a comment. Defaults to `${caller\_module\_name}: ${name}`. +* `order`: The order of the file name. Defaults to undef, otherwise must be an integer. * `packages`: The list of packages to pin. Defaults to '\*'. Can be an array or string. * `priority`: Several versions of a package may be available for installation when the sources.list(5) file contains references to more than one distribution (for example, stable and testing). APT assigns a priority to each version that is available. Subject to dependency constraints, apt-get selects the version with the highest priority for installation. * `release`: The Debian release. Defaults to ''. Typical values can be 'stable', 'testing' and 'unstable'. * `origin`: Can be used to match a hostname. The following record will assign a high priority to all versions available from the server identified by the hostname. Defaults to ''. * `version`: The specific form assigns a priority (a "Pin-Priority") to one or more specified packages with a specified version or version range. * `codename`: The distribution (lsbdistcodename) of the apt repository. Defaults to ''. --* `release_version`: Names the release version. For example, the packages in the tree might belong to Debian release version 7. Defaults to ''. ++* `release\_version`: Names the release version. For example, the packages in the tree might belong to Debian release version 7. Defaults to ''. * `component`: Names the licensing component associated with the packages in the directory tree of the Release file. defaults to ''. Typical values can be 'main', 'dependencies' and 'restricted' * `originator`: Names the originator of the packages in the directory tree of the Release file. Defaults to ''. Most commonly, this is Debian. * `label`: Names the label of the packages in the directory tree of the Release file. Defaults to ''. Most commonly, this is Debian. @@@ -239,39 -342,47 +239,39 @@@ It is recommended to read the manpage ' ####apt::ppa - * `ensure`: Whether to add or remove the PPA. Valid values are 'present' or 'absent'. Defaults to 'present'. - * `options`: Options to pass to `add-apt-repository`. OS-dependent defaults are defined in `apt::params`. - * `release`: OS-release, used in the filename of the generated sources.list.d file. Defaults to `$::lsbdistcodename`. - * `package_name`: The package to install `add-apt-repository`. OS-dependent defaults are defined in `apt::params`. - * `package_manage`: Whether or not to manage the package for `add-apt-repository`. Defaults to false. + * `ensure`: Whether we are adding or removing the PPA. Can be 'present' or 'absent'. Defaults to 'present'. + * `release`: The codename for the operating system you're running. Defaults to `$lsbdistcodename`. Required if lsb-release is not installed. + * `options`: Options to be passed to the `apt-add-repository` command. OS-dependent defaults are set in `apt::params`. -* `package_name`: The package that provides the `apt-add-repository` command. OS-dependent defaults are set in `apt::params`. -* `package_manage`: Whether or not to manage the package providing `apt-add-repository`. Defaults to true. - -### Testing - -The apt module is mostly a collection of defined resource types, which provide reusable logic for managing Apt. It provides smoke tests for testing functionality on a target system, as well as spec tests for checking a compiled catalog against an expected set of resources. - -#### Example Test - -This test sets up a Puppet Labs Apt repository. Start by creating a new smoke test, called puppetlabs-apt.pp, in the apt module's test folder. In this test, declare a single resource representing the Puppet Labs Apt source and GPG key: - -``` -class { 'apt': } - -apt::source { 'puppetlabs': - location => 'http://apt.puppetlabs.com', - repos => 'main dependencies', - key => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30', - key_server => 'pgp.mit.edu', -} -``` ++* `package\_name`: The package that provides the `apt-add-repository` command. OS-dependent defaults are set in `apt::params`. ++* `package\_manage`: Whether or not to manage the package providing `apt-add-repository`. Defaults to true. -This resource creates an Apt source named puppetlabs and gives Puppet information about the repository's location and the key used to sign its packages. Puppet leverages Facter to determine the appropriate release, but you can set this directly by adding the release type. +####apt::setting -Check your smoke test for syntax errors: +* `priority`: Integer or zero-padded integer setting the file priority. Defaults to 50. +* `ensure`: Whether to add or remove the file. Valid values are 'present', 'absent', and 'file'. Defaults to `file`. +* `source`: The source for the file. Exactly one of `content` and `source` must be specified. +* `content`: The content for the file. Exactly one of `content` and `source` must be specified. - * `notify_update`: Boolean for whether or not this `apt::setting` should trigger an `apt-get update`. Defaults to `true`. ++* `notify\_update`: Boolean for whether or not this `apt::setting` should trigger an `apt-get update`. Defaults to `true`. -`$ puppet parser validate tests/puppetlabs-apt.pp` - -If you receive no output from that command, it means nothing is wrong. Then, apply the code: - -``` -$ puppet apply --verbose tests/puppetlabs-apt.pp -notice: /Stage[main]//Apt::Source[puppetlabs]/File[puppetlabs.list]/ensure: defined content as '{md5}3be1da4923fb910f1102a233b77e982e' -info: /Stage[main]//Apt::Source[puppetlabs]/File[puppetlabs.list]: Scheduling refresh of Exec[puppetlabs apt update] -notice: /Stage[main]//Apt::Source[puppetlabs]/Exec[puppetlabs apt update]: Triggered 'refresh' from 1 events> -``` +####apt::source -The above example uses a smoke test to lay out a resource declaration and apply it on your system. In production, you might want to declare your Apt sources inside the classes where they're needed. +* `comment`: Add a comment to the apt source file. +* `ensure`: Allows you to remove the apt source file. Can be 'present' or 'absent'. +* `location`: The URL of the apt repository. Defaults to undef. Required unless `ensure => 'absent'`. +* `release`: The distribution of the apt repository. Defaults to fact 'lsbdistcodename'. +* `repos`: The component of the apt repository. This defaults to 'main'. +* `include`: Hash to configure include options. Valid keys are: + * 'deb': References a Debian distribution's binary package. Defaults to `true`. + * 'src': Enable the deb-src type, references a Debian distribution's source code in the same form as the `include['deb']` type. A deb-src line is required to fetch source indexes. Defaults to `false`. +* `key`: Add key from source. Takes either a string or a hash. If a string, the value will be passed to `id` in the `apt::key`. If a hash, valid keys are: + * 'id': See `id` in `apt::key`. Required if a hash is specified. + * 'server': See `server` in `apt::key` + * 'content': See `content` in `apt::key` + * 'source': See `source` in `apt::key` + * 'options': See `options` in `apt::key` +* `pin`: See apt::pin. Defaults to false. +* `architecture`: can be used to specify for which architectures information should be downloaded. If this option is not set all architectures defined by the APT::Architectures option will be downloaded. Defaults to `undef` which means all. Example values can be 'i386' or 'i386,alpha,powerpc'. - * `allow_unsigned`: can be set to indicate that packages from this source are always authenticated even if the Release file is not signed or the signature can't be checked. Defaults to `false`. Can be `true` or `false`. ++* `allow\_unsigned`: can be set to indicate that packages from this source are always authenticated even if the Release file is not signed or the signature can't be checked. Defaults to `false`. Can be `true` or `false`. Limitations ----------- diff --cc manifests/params.pp index cf6547a,4efe872..57cee50 --- a/manifests/params.pp +++ b/manifests/params.pp @@@ -107,7 -25,11 +107,11 @@@ class apt::params } } } + 'Cumulus Networks': { + $distid = 'debian' + $distcodename = $::lsbdistcodename + } - '': { + undef: { fail('Unable to determine lsbdistid, is lsb-release installed?') } default: { @@@ -118,20 -40,54 +122,20 @@@ 'ubuntu': { case $distcodename { 'lucid': { - $backports_location = 'http://us.archive.ubuntu.com/ubuntu' $ppa_options = undef $ppa_package = 'python-software-properties' - $legacy_origin = true - $origins = ['${distro_id} ${distro_codename}-security'] #lint:ignore:single_quote_string_with_variables } 'precise': { - $backports_location = 'http://us.archive.ubuntu.com/ubuntu' $ppa_options = '-y' $ppa_package = 'python-software-properties' - $legacy_origin = true - $origins = ['${distro_id}:${distro_codename}-security'] #lint:ignore:single_quote_string_with_variables } 'trusty', 'utopic', 'vivid': { - $backports_location = 'http://us.archive.ubuntu.com/ubuntu' $ppa_options = '-y' $ppa_package = 'software-properties-common' - $legacy_origin = true - $origins = ['${distro_id}:${distro_codename}-security'] #lint:ignore:single_quote_string_with_variables } default: { - $backports_location = 'http://old-releases.ubuntu.com/ubuntu' $ppa_options = '-y' - $ppa_package = 'software-properties-common' + $ppa_package = 'python-software-properties' - $legacy_origin = true - $origins = ['${distro_id}:${distro_codename}-security'] #lint:ignore:single_quote_string_with_variables } } } diff --cc spec/acceptance/apt_spec.rb index cea4dcd,9ace221..c948df2 --- a/spec/acceptance/apt_spec.rb +++ b/spec/acceptance/apt_spec.rb @@@ -12,28 -12,24 +12,28 @@@ describe 'apt class' d it 'should work with no errors' do pp = <<-EOS class { 'apt': - always_apt_update => true, - disable_keys => true, - purge_sources_list => true, - purge_sources_list_d => true, - purge_preferences => true, - purge_preferences_d => true, - update_timeout => '400', - update_tries => '3', - sources => { + update => { + 'frequency' => 'always', + 'timeout' => '400', + 'tries' => '3', + }, + purge => { + 'sources.list' => true, + 'sources.list.d' => true, + 'preferences' => true, + 'preferences.d' => true, + }, + sources => { 'puppetlabs' => { - 'ensure' => present, - 'location' => 'http://apt.puppetlabs.com', - 'repos' => 'main', - 'key' => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30', - 'key_server' => 'pgp.mit.edu', - } + 'ensure' => present, + 'location' => 'http://apt.puppetlabs.com', + 'repos' => 'main', + 'key' => { - 'id' => '4BD6EC30', ++ 'id' => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30', + 'server' => 'pgp.mit.edu', + }, + }, }, - fancy_progress => true, } EOS diff --cc spec/classes/apt_spec.rb index 2131c8a,d3ef34d..81d5d1b --- a/spec/classes/apt_spec.rb +++ b/spec/classes/apt_spec.rb @@@ -140,14 -154,17 +140,14 @@@ describe 'apt' d 'location' => 'http://debian.mirror.iweb.ca/debian/', 'release' => 'unstable', 'repos' => 'main contrib non-free', - 'key' => { 'id' => '55BE302B', 'server' => 'subkeys.pgp.net' }, - 'required_packages' => 'debian-keyring debian-archive-keyring', - 'key' => '150C8614919D8446E01E83AF9AA38DCD55BE302B', - 'key_server' => 'subkeys.pgp.net', ++ 'key' => { 'id' => '150C8614919D8446E01E83AF9AA38DCD55BE302B', 'server' => 'subkeys.pgp.net' }, 'pin' => '-10', - 'include_src' => true + 'include' => {'src' => true,}, }, 'puppetlabs' => { 'location' => 'http://apt.puppetlabs.com', 'repos' => 'main', - 'key' => { 'id' => '4BD6EC30', 'server' => 'pgp.mit.edu' }, - 'key' => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30', - 'key_server' => 'pgp.mit.edu', ++ 'key' => { 'id' => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30', 'server' => 'pgp.mit.edu' }, } } } } diff --cc spec/defines/ppa_spec.rb index 30a09a4,866d323..7903e47 --- a/spec/defines/ppa_spec.rb +++ b/spec/defines/ppa_spec.rb @@@ -16,28 -16,97 +16,101 @@@ describe 'apt::ppa' d end let(:title) { 'ppa:needs/such.substitution/wow' } - it { is_expected.to contain_package('python-software-properties') } + it { is_expected.to_not contain_package('python-software-properties') } it { is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow').that_notifies('Exec[apt_update]').with({ - 'environment' => [], - 'command' => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow', - 'unless' => '/usr/bin/test -s /etc/apt/sources.list.d/needs-such_substitution-wow-natty.list', - 'user' => 'root', - 'logoutput' => 'on_failure', + :environment => [], + :command => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow', + :unless => '/usr/bin/test -s /etc/apt/sources.list.d/needs-such_substitution-wow-natty.list', + :user => 'root', + :logoutput => 'on_failure', }) } + end - it { is_expected.to contain_file('/etc/apt/sources.list.d/needs-such_substitution-wow-natty.list').that_requires('Exec[add-apt-repository-ppa:needs/such.substitution/wow]').with({ - 'ensure' => 'file', - }) - } + describe 'ppa depending on ppa, MODULES-1156' do + let :pre_condition do + 'class { "apt": }' + end end + describe 'package_name => software-properties-common' do + let :pre_condition do + 'class { "apt": }' + end + let :params do + { - :package_name => 'software-properties-common' ++ :package_name => 'software-properties-common', ++ :package_manage => true, + } + end + let :facts do + { + :lsbdistrelease => '11.04', + :lsbdistcodename => 'natty', + :operatingsystem => 'Ubuntu', + :osfamily => 'Debian', + :lsbdistid => 'Ubuntu', + } + end + + let(:title) { 'ppa:needs/such.substitution/wow' } + it { is_expected.to contain_package('software-properties-common') } + it { is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow').that_notifies('Exec[apt_update]').with({ + 'environment' => [], + 'command' => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow', + 'unless' => '/usr/bin/test -s /etc/apt/sources.list.d/needs-such_substitution-wow-natty.list', + 'user' => 'root', + 'logoutput' => 'on_failure', + }) + } + + it { is_expected.to contain_file('/etc/apt/sources.list.d/needs-such_substitution-wow-natty.list').that_requires('Exec[add-apt-repository-ppa:needs/such.substitution/wow]').with({ + 'ensure' => 'file', + }) + } + end + + describe 'package_manage => false' do + let :pre_condition do + 'class { "apt": }' + end + let :facts do + { + :lsbdistrelease => '11.04', + :lsbdistcodename => 'natty', + :operatingsystem => 'Ubuntu', + :osfamily => 'Debian', + :lsbdistid => 'Ubuntu', + } + end + let :params do + { + :package_manage => false, + } + end + + let(:title) { 'ppa:needs/such.substitution/wow' } + it { is_expected.to_not contain_package('python-software-properties') } + it { is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow').that_notifies('Exec[apt_update]').with({ + 'environment' => [], + 'command' => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow', + 'unless' => '/usr/bin/test -s /etc/apt/sources.list.d/needs-such_substitution-wow-natty.list', + 'user' => 'root', + 'logoutput' => 'on_failure', + }) + } + + it { is_expected.to contain_file('/etc/apt/sources.list.d/needs-such_substitution-wow-natty.list').that_requires('Exec[add-apt-repository-ppa:needs/such.substitution/wow]').with({ + 'ensure' => 'file', + }) + } + end + describe 'apt included, no proxy' do let :pre_condition do - 'class { "apt": }' + 'class { "apt": } + apt::ppa { "ppa:foo2": } + ' end let :facts do {