From: Ken Dreyer <kdreyer@redhat.com>
Date: Thu, 30 Apr 2015 15:29:49 +0000 (-0600)
Subject: move default rhsm vars to "common" role
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7%2Fhead;p=ceph-cm-ansible.git

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 e5cb8947..9ea32405 100644
--- 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 cd8ce143..48d40237 100644
--- 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: {}