Rudder

Applied in changeset commit:1721800bc1a1d2b271f59330ce96b1526029535e.

I do not think that this test is optimal:

LDAP_TEST_REMOVED_INVENTORIES=$(/opt/rudder/sbin/slapcat 2>/dev/null | grep "Removed Inventories" | wc -l)
if [ ${LDAP_TEST_REMOVED_INVENTORIES} -ne 4  ]; then

1. The number of lines matched will be variable depending on the number of nodes removed... each one will add one to this number, causing your test to fail, and attempt to re-add these entries, thus making the rudder-upgrade script fail.
2. Matching a short piece of full text like "Removed Inventories" on the whole contents of the LDAP directory is very imprecise. What if someone creates a Directive with "Removed Inventories" in the description? It will be matched and cause this test to be wrong.

A better test can be acheived by matching the exact line you're looking for, and one that is unique, maybe something like this:

LDAP_TEST_REMOVED_INVENTORIES=$(/opt/rudder/sbin/slapcat 2>/dev/null | grep '^dn: ou=Removed Inventories,ou=Inventories,cn=rudder-configuration$' | wc -l)
if [ ${LDAP_TEST_REMOVED_INVENTORIES} -ne 1  ]; then

Looks good to me now.