From 3e6d7c18acbfb3e5214f33f341fcf7c48d52261a Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Thu, 16 Jul 2015 09:49:24 -0500 Subject: [PATCH] f; more review feedback from dmick Signed-off-by: Andrew Schoen --- roles/testnode/README.rst | 8 ++++---- roles/testnode/defaults/main.yml | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/roles/testnode/README.rst b/roles/testnode/README.rst index 5b688ff..c910124 100644 --- a/roles/testnode/README.rst +++ b/roles/testnode/README.rst @@ -23,7 +23,7 @@ Usage +++++ The testnode role is primarily used by the ``testnodes.yml`` playbook. This playbook is run by cobbler during -bare-metal imaging to prepare a node for testing and it also used by teuthology during test runs to ensure the config +bare-metal imaging to prepare a node for testing and is also used by teuthology during test runs to ensure the config is correct before testing. **NOTE:** ``testnodes.yml`` is limited to run against hosts in the ``testnodes`` group by the ``hosts`` key in the playbook. @@ -103,9 +103,9 @@ A list of packages to install that are common to a distro or distro version. The common_packages: [] -**NOTE:** A good example of how ``packages`` and ``common_packages`` work together is with Ubuntu. The var file ``roles/testnode/vars/ubuntu.yml`` define -a number of packages in ``common_packages`` that need to be installed across all versions of ubuntu. While the version specific files -(for example, ``roles/testnode/vars/ubuntu_14.yml``) define packages in ``packages`` that either have varying names across version or are only needed +**NOTE:** A good example of how ``packages`` and ``common_packages`` work together is with Ubuntu. The var file ``roles/testnode/vars/ubuntu.yml`` defines +a number of packages in ``common_packages`` that need to be installed across all versions of ubuntu, while the version-specific files +(for example, ``roles/testnode/vars/ubuntu_14.yml``) define packages in ``packages`` that either have varying names across versions or are only needed for that specific version. This is the same idea behind the vars that control apt and yum repos as well. A list of packages to remove. These lists are defined in the var files in ``vars/``:: diff --git a/roles/testnode/defaults/main.yml b/roles/testnode/defaults/main.yml index 4f3f2b3..5aebe31 100644 --- a/roles/testnode/defaults/main.yml +++ b/roles/testnode/defaults/main.yml @@ -16,7 +16,8 @@ common_apt_repos: [] # version-specific apt repos, defined in the the version-specific var files apt_repos: [] -# packages to install +# packages to install, see common_packages below as well. The set of packages to install +# is packages + common_packages packages: [] # packages common to a major version, distro or package type. This means that they -- 2.39.5