Make users a dependancy of the common role.

We want all nodes to manage users so in that respect it is common, but
keeping it in it's own role allows us more flexibility in its use.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/cobbler.yml b/cobbler.yml
index c4074bf376ac1bc9ec292412ed97741d7ca9b16e..741c671fb1fbf799dd9db141db5920b1da616e21 100644 (file)
--- a/cobbler.yml
+++ b/cobbler.yml
@@ -1,5 +1,5 @@
 ---
 - hosts: cobbler 
   roles:
-    - users
+    - common
     - cobbler 

diff --git a/roles/common/meta/main.yml b/roles/common/meta/main.yml
index 313fd690f5044eac9e181196dbe7e33b1be37fe4..3413ff83591a2debf5ce2d1be1b062541fe5aff2 100644 (file)
--- a/roles/common/meta/main.yml
+++ b/roles/common/meta/main.yml
@@ -1,3 +1,4 @@
 ---
 dependencies:
   - role: secrets
+  - role: users

diff --git a/testnodes.yml b/testnodes.yml
index 69df51c309c5759a1aab7644cf0da3b0b99658be..0c93be257846815310fbfbd1a6732b0ef6d8f30a 100644 (file)
--- a/testnodes.yml
+++ b/testnodes.yml
@@ -2,5 +2,4 @@
 - hosts: testnodes
   roles:
     - common
-    - users
     - testnode