diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2015-01-03 13:07:14 -0600 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2015-01-03 13:07:14 -0600 |
commit | 99f7a6addbad7c7f4bc4e1bcb5238f039e1c5692 (patch) | |
tree | 852aa12fe61fb9559f3888fed7b1bf234de6b9e9 /doc | |
parent | 128efd62c9acf84c54f071043e1ea954da3361dd (diff) | |
parent | d4ae5e04739d9a8e0732dd35ee28c14b0ff96957 (diff) | |
download | bcfg2-99f7a6addbad7c7f4bc4e1bcb5238f039e1c5692.tar.gz bcfg2-99f7a6addbad7c7f4bc4e1bcb5238f039e1c5692.tar.bz2 bcfg2-99f7a6addbad7c7f4bc4e1bcb5238f039e1c5692.zip |
Merge branch 'bundle-modification-deps' of https://github.com/AlexanderS/bcfg2
Conflicts:
src/lib/Bcfg2/Client/__init__.py
Diffstat (limited to 'doc')
-rw-r--r-- | doc/server/plugins/structures/bundler/bcfg2.txt | 2 | ||||
-rw-r--r-- | doc/server/plugins/structures/bundler/index.txt | 25 |
2 files changed, 16 insertions, 11 deletions
diff --git a/doc/server/plugins/structures/bundler/bcfg2.txt b/doc/server/plugins/structures/bundler/bcfg2.txt index 0fd0a3fdf..6d1159ae0 100644 --- a/doc/server/plugins/structures/bundler/bcfg2.txt +++ b/doc/server/plugins/structures/bundler/bcfg2.txt @@ -16,7 +16,7 @@ entries between Bundler and Rules. .. code-block:: xml <Bundle> - <Bundle name="bcfg2-server-base.xml"/> + <RequiredBundle name="bcfg2-server-base.xml"/> <Path name="/etc/pki/tls/private/bcfg2.key"/> <Path name="/etc/sysconfig/bcfg2-server"/> diff --git a/doc/server/plugins/structures/bundler/index.txt b/doc/server/plugins/structures/bundler/index.txt index 31faeaf17..e8f609e09 100644 --- a/doc/server/plugins/structures/bundler/index.txt +++ b/doc/server/plugins/structures/bundler/index.txt @@ -151,20 +151,21 @@ See :ref:`bcfg2-info <server-bcfg2-info>` for more details. Dependencies ============ -Dependencies on other bundles can be specified by adding an empty -bundle tag that adds another bundle by name, e.g.: +Dependencies on other bundles can be specified by adding an +RequiredBundle tag that adds another bundle by name, e.g.: .. code-block:: xml <Bundle> - <Bundle name="nfs-client"/> + <RequiredBundle name="nfs-client"/> ... </Bundle> The dependent bundle is added to the list of bundles sent to the -client, *not* to the parent bundle itself. In other words, if an -entry in the dependent bundle changes, Services are restarted and -Actions are run in the dependent bundle *only*. An example: +client, *not* to the parent bundle itself. If you want to propagate +the modification flag from the required bundle, you can add +``inherit_modification="true"`` to the RequiredBundle tag. +An example: ``nfs-client.xml``: @@ -182,7 +183,7 @@ Actions are run in the dependent bundle *only*. An example: .. code-block:: xml <Bundle> - <Bundle name="nfs-client"/> + <RequiredBundle name="nfs-client"/> <Path name="/mnt/home"/> <Path name="/etc/auto.master"/> @@ -193,9 +194,13 @@ Actions are run in the dependent bundle *only*. An example: If a new ``nfs-utils`` package was installed, the ``nfslock``, ``rpcbind``, and ``nfs`` services would be restarted, but *not* the -``autofs`` service. Similarly, if a new ``/etc/auto.misc`` file was -sent out, the ``autofs`` service would be restarted, but the -``nfslock``, ``rpcbind``, and ``nfs`` services would not be restarted. +``autofs`` service. If you would add ``inherit_modification="true"`` +to the RequiredBundle tag, you would ensure the propagation of the +modification flag and the ``autofs`` service would be restarted, +too. But if a new ``/etc/auto.misc`` file was sent out, *only* the +``autofs`` service would be restarted, but the ``nfslock``, +``rpcbind``, and ``nfs`` services would not be restarted +(independent of the ``inherit_modification`` flag). Altsrc ====== |