Merge "Fix an issue when 'acl' package can be forgotten"

ansible/roles/dev-tools/defaults/main.yml

@@ -1,12 +1,18 @@
 ---
 # List of default packages to install.
 dev_tools_packages_default:
-  # NOTE(mgoddard): The acl package is required for the setfacl command, used by
-  # become_user.
-  - acl
   - bash-completion
   - tcpdump
   - vim
 
+# List of extra packages to install.
+dev_tools_packages_extra: []
+
+# List of required packages to install.
+dev_tools_packages_system:
+  # NOTE(mgoddard): The acl package is required for the setfacl command, used by
+  # become_user.
+  - acl
+
 # List of packages to install.
-dev_tools_packages: "{{ dev_tools_packages_default }}"
+dev_tools_packages: "{{ dev_tools_packages_default + dev_tools_packages_extra + dev_tools_packages_system }}"

doc/source/configuration/reference/hosts.rst

@@ -444,6 +444,40 @@ that is signed by the key.
        components: all
        signed_by: example-key.asc
 
+Development tools
+=================
+*tags:*
+  | ``dev-tools``
+
+Development tools (additional OS packages) can be configured to be installed
+on hosts. By default Ddvelopment tools are installed on all
+``seed-hypervisor``, ``seed``, ``overcloud`` and ``infra-vms`` hosts.
+
+The following variables can be used to set which packages to install:
+
+* ``dev_tools_packages_default``: The list of packages installed by default.
+  (default is: ``bash-completion``, ``tcpdump`` and ``vim``)
+* ``dev_tools_packages_extra``: The list of additional packages installed
+  alongside default packages. (default is an empty list)
+
+In the following example, the list of default packages to be installed on all
+hosts is modified to replace ``vim`` with ``emacs``. The ``bridge-utils``
+package is added to all ``overcloud`` hosts:
+
+.. code-block:: yaml
+   :caption: ``dev-tools.yml``
+
+   dev_tools_packages_default:
+     - bash-completion
+     - emacs
+     - tcpdump
+
+.. code-block:: yaml
+   :caption: ``inventory/group_vars/overcloud/dev-tools``
+
+   dev_tools_packages_extra:
+     - bridge-utils
+
 SELinux
 =======
 *tags:*