fixed sync

Author: wtripp180901

ansible/adhoc/sync-pulp.yml

@@ -6,4 +6,4 @@
       vars:
         pulp_site_target_arch: "x86_64"
         pulp_site_target_distribution: "rocky"
-        pulp_site_target_distribution_version: "9.5" # TODO: how can we automatically make this the latest??
+        pulp_site_target_distribution_version: "9.6" # TODO: how can we automatically make this the latest??

ansible/roles/pulp_site/defaults/main.yml

@@ -1,7 +1,7 @@
 pulp_site_url: "{{ appliances_pulp_url }}"
 pulp_site_port: 8080
 pulp_site_username: admin # shouldn't be changed
-pulp_site_password: "{{ vault_pulp_admin_password }}"
+pulp_site_password: "{{ vault_pulp_admin_password }}" #todo make more obvious this is different from the password needed for ark (pulp_site_upstream_password)
 pulp_site_upstream_content_url: https://ark.stackhpc.com/pulp/content
 pulp_site_default_upstream_suffix: "{{ pulp_site_target_arch }}/os"
 pulp_site_validate_certs: false

ansible/roles/pulp_site/tasks/sync.yml

@@ -3,17 +3,7 @@
 - ansible.builtin.assert:
     that: pulp_site_upstream_password != ''
     quiet: true
-    fail_msg: "Upstream password not set. Either set env var ARK_PASSWORD or override pulp_site_upstream_password."
-
-- name: Wait for Pulp server
-  pulp.squeezer.status:
-    pulp_url: "{{ pulp_site_url }}"
-    username: "{{ pulp_site_username }}"
-    password: "{{ pulp_site_password }}"
-  register: _pulp_status
-  until: _pulp_status.failed == false
-  retries: 30
-  delay: 20
+    fail_msg: "Upstream password not set. Ensure `pulp_site_upstream_username` and `pulp_site_upstream_password` are overriden to your Ark credentials."
 
 - name: Ensure Pulp CLI config directory exists
   ansible.builtin.file:
@@ -27,6 +17,16 @@
     dest: ~/.config/pulp/cli.toml
     mode: '0644'
 
+- name: Wait for Pulp server
+  pulp.squeezer.status:
+    pulp_url: "{{ pulp_site_url }}"
+    username: "{{ pulp_site_username }}"
+    password: "{{ pulp_site_password }}"
+  register: _pulp_status
+  until: _pulp_status.failed == false
+  retries: 30
+  delay: 20
+
 - block:
   - name: Ensure squeezer cache exists
     ansible.builtin.file:

ansible/roles/pulp_site/templates/cli.toml.j2

@@ -4,7 +4,6 @@ username = "{{ pulp_site_username }}"
 password = "{{ pulp_site_password }}"
 api_root = "/pulp/"
 domain = "default"
-headers = []
 cert = ""
 key = ""
 verify_ssl = true

docs/experimental/pulp.md

@@ -8,7 +8,7 @@ In order to ensure reproducible builds, the appliance can build images using rep
 A playbook is provided to install and configure a Pulp server on a given host. Admin credentials for this server are automatically generated through the `ansible/adhoc/generate-passwords.yml` playbook. To use this, create an inventory file defining a group `pulp_server` containing a single host. The hostvar `ansible_host` should be defined, giving the IP address Ansible should use for ssh.
 
 **TODO: should be RL9 (or RL8?)**
-**TODO: add size required**
+**TODO: add size required (2 vCPUs, 4GB RAM)**
 **TODO: example inventory file**
 
 Once complete, it will print a message giving a value to set for `appliances_pulp_url`, assuming the `ansible_host` address is also the address the cluster

environments/common/inventory/groups

@@ -211,3 +211,6 @@ extra_packages
 
 [nhc]
 # Hosts to configure for node health checks - either entire 'compute' group or empty
+
+[pulp_server]
+