Update playbooks

.gitignore

@@ -1,3 +1,4 @@
 *.inv
 .vagrant
-.git
+.git
+*.pdf

CONTRIBUTING.md

@@ -1,10 +1,11 @@
 # Contributing to ansible-satellite
 
-Feel free to contribute to the source code. This set of Ansible plays was contibuted by **Stephen Clayton** _[stephenpc@gmail.com](mailto:stephenpc@gmail.com)_.
+Feel free to contribute to the source code.
 
 Contributors
 ---
 
 - [stephenpc](https://github.com/stephenpc)
 - [defionscode](https://github.com/defionscode)
 - [stenwt](https://github.com/stenwt)
+- [psehgaft](https://github.com/psehgaft)

README.md

@@ -1,16 +1,17 @@
-# ansible-satellite | Satellite 6.1.x Orchestration
+# ansible-satellite | Satellite 6.12.x Orchestration
 
-### Install and configure Satellite 6.1.x on Red Hat Enterprise Linux 6.x and 7.x. This collection can also be used to set up Satellite on AWS.
+### Install and configure Satellite 6.12.x on Red Hat Enterprise Linux 6.x and 7.x. This collection can also be used to set up Satellite on AWS.
 
-Fundamental steps are based on the process outlined at the [Satellite 6.1 Installation Guide on the Red Hat Customer Portal](https://access.redhat.com/documentation/en-US/Red_Hat_Satellite/6.1/html/Installation_Guide/index.html).
+Fundamental steps are based on the process outlined at the [Satellite 6.1 Installation Guide on the Red Hat Customer Portal](https://access.redhat.com/documentation/en-us/red_hat_satellite/6.12/html-single/installing_satellite_server_in_a_connected_network_environment/index).
 
-At the last revision of this document, the current stable version of Satellite is 6.1.8.
+At the last revision of this document, the current stable version of Satellite is 6.7
 
 Reference [standup.yml](standup.yml), which is the installation playbook, to see an example of how the playbooks may be structured, or take a look at any of the listed playbooks below.
 
 ### **ansible-satellite roles:**
 _The following roles are called by several playbooks to orchestrate tasks on the Satellite server. Please review the playbooks to see how these come together to work._
 
+1. [satellite-clients](#create-clients-tools-for-register)
 1. [satellite-auth](#satellite-authentication-satellite-auth)
 1. [satellite-content](#satellite-content-satellite-content)
 1. [satellite-install](#satellite-installation-satellite-install)
@@ -39,21 +40,86 @@ _These scripts are written to aid in refreshing subscriptions on all the hosts,
 1. [bash-refresh_subscriptions.sh](#bash-refresh_subscriptionssh)
 1. [bash-recreate_subscriptions.sh](#bash-recreate_subscriptionssh)
 
+### Configure Playbook
+Copy the inventory.template file and fill it out with information for your infrastructure. Add systems to [nodes] for hosts you want tasks to run on.
+
+or create a current host inventory on */goup_vars/inventorycontent.yml*
+
+```inventorycontext.yml
+[satellite]
+satellite.example.com
+
+[old_satellite]
+satellite.example.com
+
+[puppet_master]
+satellite.example.com
+
+[puppet_ca]
+satellite.example.com
+
+[6RedHatEnterpriseServer:vars]
+activationkey='server,6epel'
+
+[7RedHatEnterpriseServec:vars]
+activationkey='workstation,6epel'
+
+[nodes]
+node1.example.com activationkey= organization=  
+node2.example.com activationkey= organization=
+
+[satellite]
+satellite.example.com
+
+[old_satellite]
+satellite.example.com
+
+#[nodes]
+#  host.example.com organization=EXAMPLE activationkey=rhel_activation_key"
+```
+Use activation keys to register the hosts so make sure your activation keys are set up in satellite before running.
+
+#Running
+
+Enable the satellite settings create_new_host_when_facts_are_uploaded and create_new_host_when_report_is_uploaded to have hosts automatically created after puppet runs. You should also enable a default_location and default_organization in satellite. These settings are all under the puppet tab.
+
+To run on all of your nodes (defined in hosts) make sure you update the activationkey variables (in hosts) and then use.
+
+`ansible-playbook -i inventorycontext.yml satellite-playbook.yaml`
+
+Add `-k` (ssh) or `-K` (sudo) if you need password prompts.
+
+You can also run just the puppet registration tasks with
+
+`ansible-playbook -i inventorycontext.yml satellite-playbook.yaml --tags puppet`
+
+After the tasks complete you should have new unmanaged hosts in satellite. Edit the host and add any configuration you need (host groups, network, puppet). Unfortunately, I could not find a way to automate those steps yet. Your best bet is probably [hammer](https://github.com/theforeman/hammer-cli).
+
+Once the hosts have been moved you may need to reinstall the katello-agent. Do that with `ansible all -i hosts -m yum -a "state=absent name=katello-agent"` and then `ansible all -i hosts -m yum -a "state=present name=katello-agent"`
+
+NOTE: For create a Satellite inventory from de old-satellite in a Satellite migration you need to use:
+
+`ansible-playbook -i inventorycontext.yml create_inventory.yml`
+
+For resubscribe nodes in a new satellite based in your inventory context elments
+
+`ansible-playbook -i inventorycontext.yml satellite_re_subscribe.yml`
+
 ---
 
 # Roles
 
 ## Satellite Authentication (**satellite-auth**)
 _This role sets up the Satellite Server with authenticated local users, or ties it into a central LDAP server for authentication._
 
-Invoke the role in the following way. Please note the configuration values specified in [roles/satellite-auth/vars/main.yml](roles/satellite-auth/vars/main.yml), [all.yml](group_vars/all.yml) and [secrets.yml](group_vars/secrets.yml).
+Invoke the role in the following way. Please note the configuration values specified in [roles/satellite-auth/vars/main.yml](roles/satellite-auth/vars/main.yml), [satellite.yml](group_vars/satellite.yml) and [secrets.yml](group_vars/secrets.yml).
 
 ```yaml
 ---
 - hosts: satellite6-server-prod
   become: yes
   vars_files:
-    - group_vars/all.yml
+    - group_vars/satellite.yml
     - group_vars/secrets.yml
   gather_facts: yes
       # satellite-auth | Define users and assign them roles
@@ -63,17 +129,34 @@ Invoke the role in the following way. Please note the configuration values speci
       # ldap_refresh: yes
 ```
 
+## Ansible Satellite Clients (**satellite-clients**)
+_This role include tools for subscribe and unsubscribe nodes on your satellite.
+
+nvoke the role/tasks in the following way. Please note the configuration values specified in [roles/satellite-content/vars/main.yml](roles/satellite-content/vars/main.yml), [satellite.yml](group_vars/satellite.yml) and [secrets.yml](group_vars/secrets.yml).
+
+```yaml
+---
+- hosts: satellite6-server-prod
+  become: yes
+  vars_files:
+    - group_vars/satellite.yml
+    - group_vars/secrets.yml
+  gather_facts: yes
+  tasks:
+    - include_tasks: ./roles/satellite-clients/tasks/[task].yml
+```
+
 ## Satellite Content (**satellite-content**)
 _This role creates lifecycle environments on the Satellite Server, creates content views and filters them, then sets up activation keys pointing to each, and a release version with wich to activate RHEL systems._
 
-Invoke the role in the following way. Please note the configuration values specified in [roles/satellite-content/vars/main.yml](roles/satellite-content/vars/main.yml), [all.yml](group_vars/all.yml) and [secrets.yml](group_vars/secrets.yml).
+Invoke the role in the following way. Please note the configuration values specified in [roles/satellite-content/vars/main.yml](roles/satellite-content/vars/main.yml), [satellite.yml](group_vars/satellite.yml) and [secrets.yml](group_vars/secrets.yml).
 
 ```yaml
 ---
 - hosts: satellite6-server-prod
   become: yes
   vars_files:
-    - group_vars/all.yml
+    - group_vars/satellite.yml
     - group_vars/secrets.yml
   gather_facts: yes
   roles:
@@ -83,14 +166,14 @@ Invoke the role in the following way. Please note the configuration values speci
 ## Satellite Installation (**satellite-install**)
 _This role installs Satellite to a RHEL host._
 
-Invoke the role in the following way. Please note the configuration values specified in [roles/satellite-install/vars/main.yml](roles/satellite-install/vars/main.yml), [all.yml](group_vars/all.yml) and [secrets.yml](group_vars/secrets.yml).
+Invoke the role in the following way. Please note the configuration values specified in [roles/satellite-install/vars/main.yml](roles/satellite-install/vars/main.yml), [satellite.yml](group_vars/satellite.yml) and [secrets.yml](group_vars/secrets.yml).
 
 ```yaml
 ---
 - hosts: satellite6-server-prod
   become: yes
   vars_files:
-    - group_vars/all.yml
+    - group_vars/satellite.yml
     - group_vars/secrets.yml
   gather_facts: yes
     # satellite-install | Install Satellite 6 to a host
@@ -101,7 +184,7 @@ Invoke the role in the following way. Please note the configuration values speci
 ## Satellite Maintenance Tasks (**satellite-maintenance**)
 _This role covers several items with regard to maintaining the security of the Satellite server, such as SSL configuration. It also provides orchestration of rpm content to the Satellite server, so that it can be made available to hosts on a regular basis. It leverages some variables from the **satellite-content** role as well._
 
-Invoke the role in the following way. Please note the configuration values specified in [satellite-maintenance/vars/main.yml](roles/satellite-maintenance/vars/main.yml), [satellite-content/vars/main.yml](roles/satellite-content/vars/main.yml), [all.yml](group_vars/all.yml) and [secrets.yml](group_vars/secrets.yml).
+Invoke the role in the following way. Please note the configuration values specified in [satellite-maintenance/vars/main.yml](roles/satellite-maintenance/vars/main.yml), [satellite-content/vars/main.yml](roles/satellite-content/vars/main.yml), [satellite.yml](group_vars/satellite.yml) and [secrets.yml](group_vars/secrets.yml).
 
 ```yaml
 ---
@@ -120,14 +203,14 @@ Invoke the role in the following way. Please note the configuration values speci
 ## Amazon Route53 DNS Registration (**satellite-route53**)
 _This role adds an entry into Amazon Route53 DNS for the Satellite server._
 
-Invoke the role in the following way. Please note the configuration values specified in  [all.yml](group_vars/all.yml).
+Invoke the role in the following way. Please note the configuration values specified in  [satellite.yml](group_vars/satellite.yml).
 
 ```yaml
 ---
 - hosts: satellite6-server-prod
   become: yes
   vars_files:
-    - group_vars/all.yml
+    - group_vars/satellite.yml
     - group_vars/secrets.yml
   gather_facts: yes
   roles:
@@ -139,14 +222,14 @@ Invoke the role in the following way. Please note the configuration values speci
 ## Satellite Self-Subscription (**satellite-selfsubscribe**)
 _This roles subscribes the Satellite server to itself. It pauses for a period to allow someone to update the Satellite server manifest at the **Red Hat Customer Portal > Subscription Management > [Subscription Management Applications](https://access.redhat.com/management/distributors?type=satellite) > Satellite**, and will then continue to set Satellite up to receive content filtered in the same way as other systems._
 
-Invoke the role in the following way. Please note the configuration values specified in [roles/satellite-selfsubscribe/vars/main.yml](roles/satellite-selfsubscribe/vars/main.yml),  [all.yml](group_vars/all.yml) and [secrets.yml](group_vars/secrets.yml).
+Invoke the role in the following way. Please note the configuration values specified in [roles/satellite-selfsubscribe/vars/main.yml](roles/satellite-selfsubscribe/vars/main.yml),  [satellite.yml](group_vars/satellite.yml) and [secrets.yml](group_vars/secrets.yml).
 
 ```yaml
 ---
 - hosts: satellite6-server-prod
   become: yes
   vars_files:
-    - group_vars/all.yml
+    - group_vars/satellite.yml
     - group_vars/secrets.yml
   gather_facts: yes
   roles:
@@ -165,14 +248,14 @@ Note: A manifest can been created and included as part of this playbook. It can
 ## Satellite Setup (**satellite-setup**)
 _This role ties the Satellite server to Red Hat using the manifest mentioned above, activates products, repositories, and also brings in Docker images from the Red Hat Registry, along with 3rd party and custom repositories for your own generated RPM content._
 
-Invoke the role in the following way. Please note the configuration values specified in [roles/satellite-setup/vars/main.yml](roles/satellite-setup/vars/main.yml), [all.yml](group_vars/all.yml) and [secrets.yml](group_vars/secrets.yml)
+Invoke the role in the following way. Please note the configuration values specified in [roles/satellite-setup/vars/main.yml](roles/satellite-setup/vars/main.yml), [satellite.yml](group_vars/satellite.yml) and [secrets.yml](group_vars/secrets.yml)
 
 ```yaml
 ---
 - hosts: satellite6-server-prod
   become: yes
   vars_files:
-    - group_vars/all.yml
+    - group_vars/satellite.yml
     - group_vars/secrets.yml
   gather_facts: yes
   roles:
@@ -182,7 +265,7 @@ Invoke the role in the following way. Please note the configuration values speci
 ## Satellite In-Place Upgrade (**satellite-upgrade**)
 _This role performs an in-place upgrade of Satellite 6.1 to the current 6.1.x release._
 
-Invoke the role in the following way. Please note the configuration values specified in  [all.yml](group_vars/all.yml).
+Invoke the role in the following way. Please note the configuration values specified in  [satellite.yml](group_vars/satellite.yml).
 
 ```yaml
 ---

create_inventory.yml

@@ -0,0 +1,84 @@
+---
+# ansible-satellite | Satellite 6.x Orchestration
+- hosts: old_satellite
+  become: yes
+  vars_files:
+    - group_vars/satellite.yml
+    - group_vars/secrets.yml
+  gather_facts: no
+
+  tasks:
+    - set_fact: 
+        inventory_content: []
+
+    - name: ":::: Get organizations ::::"
+      import_tasks: ./roles/satellite-content/tasks/get_orgs.yml
+
+    - name: ":::: Create content inventory ::::"
+      include_tasks: ./roles/satellite-content/tasks/create_content_inventory.yml
+      with_items: "{{ organizations_list }}"
+      vars:
+        node:
+          organization: "{{ item }}"
+
+    - set_fact: 
+        inventory_satellite: "{{ inventory_content }}"
+        inventory_content: []
+
+    - name: ":::: Get list of all activation keys ::::"
+      include_tasks: ./roles/satellite-content/tasks/get_activation_keys_for_org.yml
+      with_items: "{{ inventory_satellite }}"
+      vars:
+        organization: "{{ item.organization }}"
+
+    - set_fact: 
+        inventory_satellite: "{{ inventory_content }}"
+        inventory_content: []
+
+    - name: ":::: Get Host and Key subscriptions ::::"
+      include_tasks: ./roles/satellite-content/tasks/get_nodes_for_keys.yml
+      with_items: "{{ inventory_satellite }}"
+      vars:
+        organization: "{{ item.organization }}"
+        activation_key: "{{ item.activationkey }}"
+
+    - set_fact: 
+        inventory_satellite: "{{ inventory_content }}"
+        inventory_content: []
+
+    - name: ":::: Create content inventory file ::::"
+      include_tasks: ./roles/satellite-content/tasks/create_content_inventory_file.yml 
+      vars:
+        inventory_content: "{{ inventory_satellite }}"
+      with_items: "{{ inventory_satellite }}"
+
+- hosts: localhost
+  become: yes
+  vars_files:
+    - group_vars/satellite.yml
+    - group_vars/secrets.yml
+    - group_vars/inventory_content.yml
+  gather_facts: yes
+
+  tasks:
+
+     # create dynamic groups to define variables
+    - group_by: 
+        key: "{{ ansible_distribution }}-{{ ansible_distribution_version | truncate(1, True, '') }}"
+
+    - set_fact: 
+        ak: "{{ ansible_distribution }}-{{ ansible_distribution_version | truncate(1, True, '') }}"
+
+    - name: ":::: Get repos for host ::::"
+      include_tasks: roles/satellite-clients/tasks/client_get_enable_repos.yml
+
+    - name: ":::: Unregister host ::::"
+      include_tasks: ./roles/satellite-clients/tasks/client_unsubscribe.yml
+      vars:
+        satellite: "{{ groups['old_satellite'][0] }}"
+
+    - name: ":::: Register host ::::"
+      include_tasks: ./roles/satellite-clients/tasks/client_unsubscribe.yml
+      vars:
+        satellite: "{{ groups['satellite'][0] }}"
+        activationkey: "{{ groups[ak] }}"

ec2_content_hosts_cleanup.yml

@@ -14,7 +14,7 @@
       prompt: "Enter your username. (Required, defaults to admin)"
       default: "admin"
       private: no
-    - name: "sat_admin_password"
+    - name: "rhn_pass"
       prompt: "Enter your password. (Required)"
       private: yes
     - name: "satellite_organization_id"
@@ -33,7 +33,7 @@
         body_format: json
         method: GET
         user: "{{ sat_admin_user }}"
-        password: "{{ sat_admin_password }}"
+        password: "{{ rhn_pass }}"
         status_code: [ 200, 201 ]
         url: "https://{{ satellite_server }}/katello/api/systems?organization_id={{ satellite_organization_id | default(1) }}&per_page=5000"
         validate_certs: no
@@ -52,7 +52,7 @@
         body_format: json
         method: DELETE
         user: "{{ sat_admin_user }}"
-        password: "{{ sat_admin_password }}"
+        password: "{{ rhn_pass }}"
         status_code: [ 200, 201, 204 ]
         url: "https://{{ satellite_server }}/katello/api/systems/{{ item.uuid }}"
         validate_certs: no

ec2_content_hosts_report.yml

@@ -14,7 +14,7 @@
       prompt: "Enter your username. (Required, defaults to admin)"
       default: "admin"
       private: no
-    - name: "sat_admin_password"
+    - name: "rhn_pass"
       prompt: "Enter your password. (Required)"
       private: yes
     - name: "satellite_organization_id"
@@ -33,7 +33,7 @@
         body_format: json
         method: GET
         user: "{{ sat_admin_user }}"
-        password: "{{ sat_admin_password }}"
+        password: "{{ rhn_pass }}"
         status_code: [ 200, 201 ]
         url: "https://{{ satellite_server }}/katello/api/systems?organization_id={{ satellite_organization_id | default(1) }}&per_page=5000"
         validate_certs: no

group_vars/inventory.template

@@ -0,0 +1,8 @@
+[satellite]
+satellite.example.com
+
+[old_satellite]
+satellite.example.com
+
+[nodes]
+#  host.example.com organization=EXAMPLE activationkey=rhel_activation_key"