default to an emtpy list to avoid getting KeyErrors or handling a None.

This should *never* happen, because the install module will always pass
something *unless* it is being explicitly asked not to install anything.

Signed-off-by: Alfredo Deza <adeza@redhat.com>

diff --git a/ceph_deploy/hosts/centos/install.py b/ceph_deploy/hosts/centos/install.py
index 75821e29318b6ef9304949fed7c7c921a363f2ac..6df57f40bcd158dc74e61fa689040dc65f45b1b1 100644 (file)
--- a/ceph_deploy/hosts/centos/install.py
+++ b/ceph_deploy/hosts/centos/install.py
@@ -165,7 +165,7 @@ def repo_install(distro, reponame, baseurl, gpgkey, **kw):
     # removed them from `kw` so that we don't mess with other defaults
     # note: when split packages for ceph land for CentOS, `packages`
     # can be used. Unused for now.
-    packages = kw.pop('components', default_components) or default_components  # noqa
+    packages = kw.pop('components', [])  # noqa
     logger = distro.conn.logger
     # Get some defaults
     name = kw.pop('name', '%s repo' % reponame)

diff --git a/ceph_deploy/hosts/debian/install.py b/ceph_deploy/hosts/debian/install.py
index 190e435846d56b6bb72a702b1f2575d7b642f7be..bdb3f1b4f60a34cc80b901305c1b1eecaa0004fa 100644 (file)
--- a/ceph_deploy/hosts/debian/install.py
+++ b/ceph_deploy/hosts/debian/install.py
@@ -156,7 +156,7 @@ def repo_install(distro, repo_name, baseurl, gpgkey, **kw):
     # removed them from `kw` so that we don't mess with other defaults
     # note: when split packages for ceph land for Debian/Ubuntu, `packages`
     # can be used. Unused for now.
-    packages = kw.pop('components', default_components) or default_components
+    packages = kw.pop('components', [])
     # Get some defaults
     safe_filename = '%s.list' % repo_name.replace(' ', '-')
     install_ceph = kw.pop('install_ceph', False)

diff --git a/ceph_deploy/hosts/rhel/install.py b/ceph_deploy/hosts/rhel/install.py
index b0b74d88dac3594fa8e9c060f34f6430bf5207a8..9a44cdd4b1be0fd90b6ad6a9ff2870f3356247cb 100644 (file)
--- a/ceph_deploy/hosts/rhel/install.py
+++ b/ceph_deploy/hosts/rhel/install.py
@@ -3,14 +3,14 @@ from ceph_deploy.lib import remoto
 
 
 def install(distro, version_kind, version, adjust_repos, **kw):
-    packages = kw.get('components', default_components) or default_components
+    packages = kw.get('components', [])
     pkg_managers.yum_clean(distro.conn)
     pkg_managers.yum(distro.conn, packages)
 
 
 def mirror_install(distro, repo_url,
                    gpg_url, adjust_repos, extra_installs=True, **kw):
-    packages = kw.get('components', default_components) or default_components
+    packages = kw.get('components', [])
     repo_url = repo_url.strip('/')  # Remove trailing slashes
     gpg_url_path = gpg_url.split('file://')[-1]  # Remove file if present
 
@@ -40,7 +40,7 @@ def mirror_install(distro, repo_url,
 def repo_install(distro, reponame, baseurl, gpgkey, **kw):
     # do we have specific components to install?
     # removed them from `kw` so that we don't mess with other defaults
-    packages = kw.pop('components', default_components) or default_components
+    packages = kw.pop('components', [])
 
     # Get some defaults
     name = kw.pop('name', '%s repo' % reponame)

diff --git a/ceph_deploy/hosts/suse/install.py b/ceph_deploy/hosts/suse/install.py
index 24dce7fc41abf46b6999d8321800189d55669779..0a11ae4ed5ef75f3c49de1f9b92451244846b964 100644 (file)
--- a/ceph_deploy/hosts/suse/install.py
+++ b/ceph_deploy/hosts/suse/install.py
@@ -129,7 +129,7 @@ def repo_install(distro, reponame, baseurl, gpgkey, **kw):
     # removed them from `kw` so that we don't mess with other defaults
     # note: when split packages for ceph land for Suse, `packages`
     # can be used. Unused for now.
-    packages = kw.pop('components', default_components) or default_components  # noqa
+    packages = kw.pop('components', [])  # noqa
     # Get some defaults
     name = kw.get('name', '%s repo' % reponame)
     enabled = kw.get('enabled', 1)