Avoid installing recommended packages by APT
We need to support the installation when using fuel-createmirror. It
means that we need to embed all packages that are required to install
collectd. As we don't want to embed recommended packages we need to
configure the packaging tool accordingly.
Closes-Bug: #1494186
Change-Id: I22ec782d747b3ccd0a0a4d4e39e7a94ba51a56e3
(cherry picked from commit ced36b62d1
)
This commit is contained in:
parent
d919e5ab66
commit
52cd57b38a
|
@ -136,6 +136,7 @@ Release Notes
|
|||
**0.7.3**
|
||||
|
||||
* Support for MOS 7.0.
|
||||
* Support installation without Internet connectivity ([LP#1494186](https://bugs.launchpad.net/fuel-plugins/+bug/1494186)).
|
||||
* Collect Swift logs ([LP#1480293](https://bugs.launchpad.net/fuel-plugins/+bug/1480293)).
|
||||
* Collect HAProxy logs ([LP#1480297](https://bugs.launchpad.net/fuel-plugins/+bug/1480297)).
|
||||
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
# Copyright 2015 Mirantis, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
include lma_collector::params
|
||||
|
||||
case $::osfamily {
|
||||
'Debian': {
|
||||
file { $::lma_collector::params::apt_config_file:
|
||||
ensure => absent,
|
||||
}
|
||||
}
|
||||
default: {
|
||||
# Currently only Debian like distributions need specific configuration.
|
||||
}
|
||||
}
|
|
@ -0,0 +1,31 @@
|
|||
# Copyright 2015 Mirantis, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
include lma_collector::params
|
||||
|
||||
$str = 'APT::Install-Suggests "0";
|
||||
APT::Install-Recommends "0";
|
||||
'
|
||||
|
||||
case $::osfamily {
|
||||
'Debian': {
|
||||
file { $::lma_collector::params::apt_config_file:
|
||||
ensure => file,
|
||||
content => $str,
|
||||
}
|
||||
}
|
||||
default: {
|
||||
# Currently only Debian like distributions need specific configuration.
|
||||
}
|
||||
}
|
|
@ -17,6 +17,8 @@ class lma_collector::params {
|
|||
$config_dir = "/etc/${service_name}"
|
||||
$plugins_dir = "/usr/share/${service_name}"
|
||||
|
||||
$apt_config_file = '/etc/apt/apt.conf.d/99norecommends'
|
||||
|
||||
$tags = {}
|
||||
|
||||
$syslog_pattern = '<%PRI%>%TIMESTAMP% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg%\n'
|
||||
|
|
21
tasks.yaml
21
tasks.yaml
|
@ -8,6 +8,18 @@
|
|||
timeout: 300
|
||||
|
||||
# The following tasks are executed in the order they are declared
|
||||
|
||||
# We need to control what is deployed when we install a new package. So
|
||||
# we need to prevent the installation of recommended packages.
|
||||
# See https://bugs.launchpad.net/fuel-plugins/+bug/1494186
|
||||
- role: '*'
|
||||
stage: post_deployment/8200
|
||||
type: puppet
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/configure_apt.pp
|
||||
puppet_modules: puppet/modules
|
||||
timeout: 600
|
||||
|
||||
- role: '*'
|
||||
stage: post_deployment/8200
|
||||
type: puppet
|
||||
|
@ -47,3 +59,12 @@
|
|||
puppet_manifest: puppet/manifests/ceph_osd.pp
|
||||
puppet_modules: puppet/modules
|
||||
timeout: 600
|
||||
|
||||
- role: '*'
|
||||
stage: post_deployment/8200
|
||||
type: puppet
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/cleanup_apt_config.pp
|
||||
puppet_modules: puppet/modules
|
||||
timeout: 600
|
||||
|
||||
|
|
Loading…
Reference in New Issue