Adding playbook to 'only' update Satellite Server admin (#316)

* Adding playbook to 'only' update Satellite Server admin

* Updated Satellite playbook

* Updated Satellite playbook

* Updated Activation key tasks

* Fixing left-over 'satellite_servers'

inventory/satellite-server/group_vars/satellite-server.yml

@@ -44,5 +44,8 @@ satellite_sync_plan: "CASL"
 
 # Add some activation keys that the users can utilize
 satellite_activation_keys:
-  casl-rhel:
-    subscription: "MySubs"
+- name: "casl-rhel1"
+  subscription: "MySubs"
+  type: "Physical"
+- name: "casl-rhel2"
+  subscription: "MySubs"

playbooks/provision-satellite-server/configure-satellite-server.yml

@@ -2,7 +2,7 @@
 
 - hosts: satellite-server
   pre_tasks:
-  - import_tasks: generate-lvm-list.yml
+    - import_tasks: generate-lvm-list.yml
   roles:
-  - role: config-lvm
-  - role: config-satellite
+    - role: config-lvm
+    - role: config-satellite

playbooks/provision-satellite-server/update-satellite-server-admin.yml

@@ -0,0 +1,19 @@
+---
+
+- hosts: satellite-server
+  tasks:
+    - import_role:
+        name: config-satellite
+        tasks_from: manifest
+      tags:
+        - 'update_manifest'
+    - import_role:
+        name: config-satellite
+        tasks_from: repos
+      tags:
+        - 'update_repos'
+    - import_role:
+        name: config-satellite
+        tasks_from: activation_keys
+      tags:
+        - 'update_activation_keys'

playbooks/services.yml

@@ -38,7 +38,7 @@
   - configure_idm
 
 - name: 'Configure Satellite'
-  hosts: satellite_servers
+  hosts: satellite-server
   roles:
   - role: config-satellite
   tags:

roles/config-satellite/README.md

@@ -31,7 +31,7 @@ Example Playbook
 
 ```
 - name: 'Configure Satellite'
-  hosts: satellite_servers
+  hosts: satellite-server
   roles:
   - role: config-satellite
 ```

roles/config-satellite/tasks/activation_keys.yml

@@ -1,49 +1,11 @@
 ---
 
 - name: "Get current subscriptions"
-  shell: hammer -u "{{ satellite_username }}" -p "{{ satellite_password }}" --csv subscription list --organization "{{ satellite_organization }}" | grep "{{ item.value.subscription }}" | awk -F, '{print $1}'
+  shell: hammer -u "{{ satellite_username }}" -p "{{ satellite_password }}" --output=yaml subscription list --organization "{{ satellite_organization }}"
   register: subids
-  with_dict: "{{ satellite_activation_keys }}"
 
-- name: "Create activation key(s)"
-  command: > 
-    hammer
-      -u "{{ satellite_username }}"
-      -p "{{ satellite_password }}"
-      activation-key create
-      --name {{ item.key }}
-      --lifecycle-environment Library
-      --organization "{{ satellite_organization }}"
-  with_dict: "{{ satellite_activation_keys }}"
-  register: chk_ak
-  failed_when:
-  - chk_ak.rc != 65
-  - chk_ak.rc != 0
-
-- name: "Add subs to activation key"
-  command: >
-     hammer
-       -u "{{ satellite_username }}"
-       -p "{{ satellite_password }}"
-       activation-key add-subscription
-       --name "{{ item.item.key }}"
-       --subscription-id "{{ item.stdout }}"
-       --organization "{{ satellite_organization }}"
-  with_items:
-  - "{{ subids.results }}"
-  register: ak_chk
-  failed_when:
-  - ak_chk.rc != 128
-  - ak_chk.rc != 0
-
-- name: "Turn off autoattach on activation key(s)"
-  command: >
-    hammer
-      -u "{{ satellite_username }}"
-      -p "{{ satellite_password }}"
-      activation-key update
-      --auto-attach false
-      --name "{{ item.key }}"
-      --organization "{{ satellite_organization }}"
-  with_dict: "{{ satellite_activation_keys }}"
+- include_tasks: process-one-activation-key.yml
+  loop: "{{ satellite_activation_keys }}"
+  loop_control:
+    loop_var: activation_key
 

roles/config-satellite/tasks/manifest.yml

@@ -14,6 +14,7 @@
       subscription upload
       --file /root/manifest.zip
       --organization "{{ satellite_organization }}"
-  when: copy_sub|changed
+  when:
+    - copy_sub.changed
 
 

roles/config-satellite/tasks/process-one-activation-key.yml

@@ -0,0 +1,47 @@
+---
+
+- name: "Create activation key"
+  command: > 
+    hammer
+      -u "{{ satellite_username }}"
+      -p "{{ satellite_password }}"
+      activation-key create
+      --name "{{ activation_key.name }}"
+      --lifecycle-environment Library
+      --organization "{{ satellite_organization }}"
+  register: chk_ak
+  failed_when:
+  - chk_ak.rc != 65
+  - chk_ak.rc != 0
+
+- name: "Add subs to activation key"
+  command: >
+     hammer
+       -u "{{ satellite_username }}"
+       -p "{{ satellite_password }}"
+       activation-key add-subscription
+       --name "{{ activation_key.name }}"
+       --subscription-id "{{ item.ID }}"
+       --organization "{{ satellite_organization }}"
+  when:
+  - (activation_key.type is defined and
+     item.Type == activation_key.type and
+     item.Name == activation_key.subscription) or
+    (activation_key.type is undefined and 
+     item.Name == activation_key.subscription)
+  with_items:
+  - "{{ subids.stdout | from_yaml }}"
+  register: ak_chk
+  failed_when:
+  - ak_chk.rc != 128
+  - ak_chk.rc != 0
+
+- name: "Turn off autoattach on activation key(s)"
+  command: >
+    hammer
+      -u "{{ satellite_username }}"
+      -p "{{ satellite_password }}"
+      activation-key update
+      --auto-attach false
+      --name "{{ activation_key.name }}"
+      --organization "{{ satellite_organization }}"

roles/config-satellite/tests/hosts

@@ -1,3 +1,3 @@
 
-[satellite_servers]
+[satellite-server]
 sat.example.com ansible_user=root ansible_host=192.168.1.10

roles/config-satellite/tests/test.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: 'Configure Satellite'
-  hosts: satellite_servers
+  hosts: satellite-server
   roles:
   - role: config-satellite