From 71f4817263a21b6e2062b35928ebfab373d26278 Mon Sep 17 00:00:00 2001
From: Vinny Valdez <vvaldez@redhat.com>
Date: Fri, 8 Apr 2016 11:02:57 -0500
Subject: Cosmetic changes to task names and move yum clean all to prereqs

---
 roles/subscription-manager/tasks/main.yml | 33 ++++++++++++++-----------------
 1 file changed, 15 insertions(+), 18 deletions(-)

(limited to 'roles')

diff --git a/roles/subscription-manager/tasks/main.yml b/roles/subscription-manager/tasks/main.yml
index 6e51be7e4..adf3a8e85 100644
--- a/roles/subscription-manager/tasks/main.yml
+++ b/roles/subscription-manager/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-- name: Initialize rhsm_password variable if vars_prompt was used
+- name: "Initialize rhsm_password variable if vars_prompt was used"
   set_fact:
     rhsm_password: "{{ hostvars.localhost.rhsm_password }}"
   when:
@@ -7,12 +7,12 @@
       - rhsm_password is not none
       - rhsm_password|trim != ''
   
-- name: Initializing Subscription Manager authenticaiton method
+- name: "Initializing Subscription Manager authenticaiton method"
   set_fact:
     rhsm_authentication: false
 
 # 'rhsm_activationkey' will take precedence even if 'rhsm_username' and 'rhsm_password' are also set
-- name: Setting Subscription Manager Activation Key Fact
+- name: "Setting Subscription Manager Activation Key Fact"
   set_fact:
     rhsm_authentication: "key"
   when:
@@ -22,7 +22,7 @@
     - not rhsm_authentication
 
 # If 'rhsm_username' and 'rhsm_password' are set but not 'rhsm_activationkey', set 'rhsm_authentication' to password
-- name: Setting Subscription Manager Username and Password Fact
+- name: "Setting Subscription Manager Username and Password Fact"
   set_fact:
     rhsm_authentication: "password"
   when:
@@ -34,28 +34,28 @@
     - rhsm_password|trim != ''
     - not rhsm_authentication
 
-- name: Initializing registration status
+- name: "Initializing registration status"
   set_fact:
     registered: false
 
-- name: Checking subscription status (a failure means it is not registered and will be)
+- name: "Checking subscription status (a failure means it is not registered and will be)"
   command: "/usr/bin/subscription-manager status"
   ignore_errors: yes
   changed_when: no
   register: check_if_registered
 
-- name: Set registration fact if system is already registered
+- name: "Set registration fact if system is already registered"
   set_fact:
     registered: true
   when: check_if_registered.rc == 0
 
-- name: Cleaning any old subscriptions
+- name: "Cleaning any old subscriptions"
   command: "/usr/bin/subscription-manager clean"
   when:
     - not registered
     - rhsm_authentication is defined
 
-- name: Install Satellite certificate
+- name: "Install Satellite certificate"
   command: "rpm -Uvh --force http://{{ rhsm_satellite }}/pub/katello-ca-consumer-latest.noarch.rpm"
   when:
     - not registered
@@ -63,7 +63,7 @@
     - rhsm_satellite is not none
     - rhsm_satellite|trim != ''
 
-- name: Register to Satellite using activation key
+- name: "Register to Satellite using activation key"
   command: "/usr/bin/subscription-manager register --activationkey={{ rhsm_activationkey }} --org={{ rhsm_org }}"
   when:
     - not registered
@@ -73,20 +73,20 @@
     - rhsm_satellite|trim != ''
 
 # This can apply to either Hosted or Satellite
-- name: Register using username and password
+- name: "Register using username and password"
   command: "/usr/bin/subscription-manager register --username={{ rhsm_username }} --password={{ rhsm_password }}"
   no_log: true
   when:
     - not registered
     - rhsm_authentication == "password"
 
-- name: Auto-attach to Subscription Manager Pool
+- name: "Auto-attach to Subscription Manager Pool"
   command: "/usr/bin/subscription-manager attach --auto"
   when:
     - not registered
     - rhsm_pool is undefined or rhsm_pool is none or rhsm_pool|trim == ''
 
-- name: Attach to a specific pool
+- name: "Attach to a specific pool"
   command: "/usr/bin/subscription-manager attach --pool={{ rhsm_pool }}"
   when:
     - rhsm_pool is defined
@@ -94,7 +94,7 @@
     - rhsm_pool|trim != ''
     - not registered
 
-- name: Disable all repositories
+- name: "Disable all repositories"
   command: "/usr/bin/subscription-manager repos --disable=*"
   when:
     - not registered
@@ -102,7 +102,7 @@
     - rhsm_repos is not none
     - rhsm_repos|trim != ''
 
-- name: Enable specified repositories
+- name: "Enable specified repositories"
   command: "/usr/bin/subscription-manager repos --enable={{ item }}"
   with_items: rhsm_repos
   when:
@@ -110,6 +110,3 @@
     - rhsm_repos is defined
     - rhsm_repos is not none
     - rhsm_repos|trim != ''
-
-- name: Cleaning yum repositories
-  command: "yum clean all"
-- 
cgit v1.2.3