add 7.0 to list of supported versions

RedHatSatellite · Mar 7, 2022 · 055094d · 055094d
1 parent 36adf44
commit 055094d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -13,6 +13,7 @@ Throughout this documentation, ensure that you understand the following terminol
 - 6.8
 - 6.9
 - 6.10
+- 7.0
 
 #### What you need: ####
   - A blank (vanilla install) RHEL 7 server (target server). You will run the setup commands here.
@@ -29,13 +30,14 @@ On the target server:
    # git clone https://github.com/RedHatSatellite/satellite-clone.git
    ```
 2. Enable the Ansible repository corresponding to your Satellite version
-   |Satellite Version|Ansible Repository            |
-   |-----------------|------------------------------|
-   |6.10             |rhel-7-server-ansible-2.9-rpms|
-   |6.9              |rhel-7-server-ansible-2.9-rpms|
-   |6.8              |rhel-7-server-ansible-2.9-rpms|
-   |6.7              |rhel-7-server-ansible-2.8-rpms|
-   |6.6              |rhel-7-server-ansible-2.8-rpms|
+   |Satellite Version|RHEL 7 Ansible Repository     |RHEL 8 Ansible Repository         |
+   |-----------------|------------------------------|----------------------------------|
+   |7.0              |rhel-7-server-ansible-2.9-rpms|ansible-2.9-for-rhel-8-x86_64-rpms|
+   |6.10             |rhel-7-server-ansible-2.9-rpms|N/A                               |
+   |6.9              |rhel-7-server-ansible-2.9-rpms|N/A                               |
+   |6.8              |rhel-7-server-ansible-2.9-rpms|N/A                               |
+   |6.7              |rhel-7-server-ansible-2.8-rpms|N/A                               |
+   |6.6              |rhel-7-server-ansible-2.8-rpms|N/A                               |
 
    ```console
    # subscription-manager repos --enable REPO_NAME

diff --git a/library/parse_backup_metadata.py b/library/parse_backup_metadata.py
@@ -18,7 +18,7 @@
 #          - Full path (including file name) to metadata.yml
 #        required: true
 
-SUPPORTED_VERSIONS = ["6.6", "6.7", "6.8", "6.9", "6.10"]
+SUPPORTED_VERSIONS = ["6.6", "6.7", "6.8", "6.9", "6.10", "7.0"]
 
 def find_rpm(rpms, pattern):
     rpm_pattern = re.compile(pattern)

diff --git a/roles/satellite-clone/vars/satellite_7.0.yml b/roles/satellite-clone/vars/satellite_7.0.yml
@@ -0,0 +1,15 @@
+---
+# See the following issues for installer options
+# https://github.com/RedHatSatellite/satellite-clone/issues/268
+# https://github.com/RedHatSatellite/satellite-clone/issues/349
+satellite_installer_options: "--foreman-ipa-authentication false --reset-puppet-server-ssl-chain-filepath --disable-system-checks"
+satellite_upgrade_options: "--disable-system-checks"
+verify_rake_task: reimport
+selinux_packages:
+  - foreman-selinux
+  - katello-selinux
+  - pulpcore-selinux
+db_packages:
+  - "{{ postgresql_package_name }}"
+satellite_ansible_version: '2.9'
+satellite_maintenance_version: '7.0'