move default rhsm vars to "common" role

Commit 3d1ecaac01f9ed7a589741700fdb7fc22056218c moved the Red Hat
subscription bits into the "common" role, but I neglected to move the
default variables to "common" as well. Move them here.

diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml
index e5cb894766a2f0fa2bedf7280058a32f388b78ef..9ea3240564213f710c5e44318f4d313d2a58d746 100644 (file)
--- a/roles/common/defaults/main.yml
+++ b/roles/common/defaults/main.yml
@@ -1,4 +1,8 @@
 ---
+# Red Hat Subscription Manager credentials
+subscription_manager_activationkey: ""
+subscription_manager_org: ""
+
 # Repos to enable in Red Hat Subscription Manager
 rhsm_repos: []
 

diff --git a/roles/testnode/defaults/main.yml b/roles/testnode/defaults/main.yml
index cd8ce143f493fe51ce7876a5f85192446ad61d15..48d40237417b5f6797f1c7569ee8e8a3e405827b 100644 (file)
--- a/roles/testnode/defaults/main.yml
+++ b/roles/testnode/defaults/main.yml
@@ -1,9 +1,6 @@
 ---
 pip_mirror_url: "http://{{ mirror_host }}/pypi/simple"
 
-subscription_manager_activationkey: ""
-subscription_manager_org: ""
-
 # repos common to a major version
 common_yum_repos: {}