update repository roles (#343)

Co-authored-by: David Danielsson <[email protected]>
ansible · Nov 29, 2023 · 9d2024d · 9d2024d
1 parent 06fb654
commit 9d2024d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 48 deletions.
diff --git a/roles/repository/README.md b/roles/repository/README.md
@@ -3,6 +3,7 @@
 ## Description
 
 An Ansible Role to create Repositories in Automation Hub.
+This role has been depreciated and is not supported in AAP 2.4 onwards. It is replaced by collection_remote.
 
 ## Variables
 
@@ -81,17 +82,15 @@ This also speeds up the overall role.
 
 ```yaml
 ---
-ah_repository_certified:
-  url: 'https://cloud.redhat.com/api/automation-hub/<custom_sync_url_from_cloud>'
-  token: 'secretToken'
-
-ah_repository_community:
-  url: https://galaxy.ansible.com/api/
-  requirements:
-    - galaxy.galaxy
-    - infra.controller_configuration
-    - infra.aap_utilities
-    - infra.ee_utilities
+ah_repositories:
+  - name: community
+    url: https://beta-galaxy.ansible.com/
+    requirements:
+      - name: infra.ee_utilities
+      - name: infra.controller_configuration
+    wait: true
+    interval: 25
+    timeout: 1000000
 ```
 
 ## Playbook Examples

diff --git a/roles/repository/meta/argument_specs.yml b/roles/repository/meta/argument_specs.yml
@@ -3,26 +3,12 @@ argument_specs:
   main:
     short_description: An Ansible Role to create repositories in Automation Hub.
     options:
-      ah_repository_certified:
+      ah_repositories:
+        default: []
         required: false
-        description: Data structure describing the certified repository to manage.
-        type: dict
-      ah_repository_community:
-        required: false
-        description: Data structure describing the community repository to manage.
-        type: dict
-      proxy_url:
-        required: false
-        type: str
-        description: Information regarding the proxy that AH will use to communicate to the Red Hat repositories. Can be left empty if no proxy used.
-      proxy_username:
-        required: false
-        type: str
-        description: Information regarding the proxy that AH will use to communicate to the Red Hat repositories. Can be left empty if no proxy used.
-      proxy_password:
-        required: false
-        type: str
-        description: Information regarding the proxy that AH will use to communicate to the Red Hat repositories. Can be left empty if no proxy used.
+        description: Data structure describing the collection repositories to sync.
+        type: list
+        elements: dict
 
       # Async variables
       ah_configuration_async_dir:

diff --git a/roles/repository_sync/README.md b/roles/repository_sync/README.md
@@ -3,6 +3,7 @@
 ## Description
 
 An Ansible Role to sync Repositories in Automation Hub.
+This role has been depreciated and is not supported in AAP 2.4 onwards. It is replaced by collection_remote_sync.
 
 ## Variables
 
@@ -64,17 +65,8 @@ This also speeds up the overall role.
 
 ```yaml
 ---
-ah_repository_certified:
-  url: 'https://cloud.redhat.com/api/automation-hub/<custom_sync_url_from_cloud>'
-  token: 'secretToken'
-
-ah_repository_community:
-  url: https://galaxy.ansible.com/api/
-  requirements:
-    - galaxy.galaxy
-    - infra.controller_configuration
-    - infra.aap_utilities
-    - infra.ee_utilities
+ah_repositories:
+  - name: community
 ```
 
 ## Playbook Examples

diff --git a/roles/repository_sync/meta/argument_specs.yml b/roles/repository_sync/meta/argument_specs.yml
@@ -3,14 +3,12 @@ argument_specs:
   main:
     short_description: An Ansible Role to sync repositories in Automation Hub.
     options:
-      ah_repository_certified:
+      ah_repositories:
+        default: []
         required: false
-        description: Data structure describing the certified repository to manage.
-        type: dict
-      ah_repository_community:
-        required: false
-        description: Data structure describing the community repository to manage.
-        type: dict
+        description: Data structure describing the collection repositories to sync.
+        type: list
+        elements: dict
 
       # Async variables
       ah_configuration_async_dir: