Merge branch 'bug_15878/we_still_have_an_ldap_entry_ou_nodes_configur…

…ation_which_is_not_used_anymore_pr' into branches/rudder/5.0
Normation · Nov 13, 2019 · c4ed9a3 · c4ed9a3
2 parents 9151902 + 6e01dbe
commit c4ed9a3
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 16 deletions.
diff --git a/webapp/sources/rudder/rudder-core/src/main/resources/ldap/bootstrap.ldif b/webapp/sources/rudder/rudder-core/src/main/resources/ldap/bootstrap.ldif
@@ -22,13 +22,6 @@ objectclass: organizationalUnit
 ou: Rudder
 description: Branch that stores all Rudder specific data
 
-## Rudder Node configuration branch
-
-dn: ou=Nodes Configuration,ou=Rudder,cn=rudder-configuration
-objectClass: organizationalUnit
-objectClass: top
-ou: Nodes Configuration
-
 ## Inventories related branches
 
 dn: ou=Inventories,cn=rudder-configuration

diff --git a/...er/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/LoadDemoDataTest.scala b/...er/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/LoadDemoDataTest.scala
@@ -43,8 +43,6 @@ import org.specs2.runner._
 import com.normation.ldap.listener.InMemoryDsConnectionProvider
 import com.normation.ldap.sdk.RoLDAPConnection
 import com.normation.ldap.sdk.RwLDAPConnection
-import com.unboundid.ldap.sdk.DN
-import net.liftweb.common.Failure
 
 
 /**

diff --git a/webapp/sources/scala-ldap/src/test/resources/ldap-data/bootstrap.ldif b/webapp/sources/scala-ldap/src/test/resources/ldap-data/bootstrap.ldif
@@ -19,13 +19,6 @@ objectclass: organizationalUnit
 ou: Rudder
 description: Branch that stores all Rudder specific data
 
-## Rudder Node configuration branch
-
-dn: ou=Nodes Configuration,ou=Rudder,cn=rudder-configuration
-objectClass: organizationalUnit
-objectClass: top
-ou: Nodes Configuration
-
 ## Inventories related branches
 
 dn: ou=Inventories,cn=rudder-configuration