Merge pull request #332 from Spredzy/fix_6975

Drop hardcoded Redis dependency
pulp · Jun 17, 2020 · 31be2d3 · 31be2d3
2 parents 7631297 + 5584084
commit 31be2d3
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 4 deletions.
diff --git a/CHANGES/6975.misc b/CHANGES/6975.misc
@@ -0,0 +1 @@
+Removed pulp-redis dependency from pulp_workers and pulp_resource_manager
diff --git a/molecule/release-dynamic/converge.yml b/molecule/release-dynamic/converge.yml
@@ -13,6 +13,7 @@
       include_role:
         name: "{{ roleinputvar }}"
       loop:
+        - pulp_redis
         - pulp_database
         - pulp_workers
         - pulp_resource_manager

diff --git a/molecule/source-dynamic/converge.yml b/molecule/source-dynamic/converge.yml
@@ -13,6 +13,7 @@
       include_role:
         name: "{{ roleinputvar }}"
       loop:
+        - pulp_redis
         - pulp_database
         - pulp_workers
         - pulp_resource_manager

diff --git a/playbooks/example-source/playbook.yml b/playbooks/example-source/playbook.yml
@@ -9,6 +9,7 @@
         msg: >
           "You must update Ansible to at least 2.8 to use this version of Pulp 3 Installer."
   roles:
+    - pulp_redis
     - pulp_database
     - pulp_workers
     - pulp_resource_manager

diff --git a/playbooks/example-use/playbook.yml b/playbooks/example-use/playbook.yml
@@ -9,6 +9,7 @@
         msg: >
           "You must update Ansible to at least 2.8 to use this version of Pulp 3 Installer."
   roles:
+    - pulp_redis
     - pulp_database
     - pulp_workers
     - pulp_resource_manager

diff --git a/roles/pulp_resource_manager/defaults/main.yml b/roles/pulp_resource_manager/defaults/main.yml
@@ -3,3 +3,5 @@ pulp_resource_manager_state: started
 pulp_resource_manager_enabled: true
 pulp_config_dir: "/etc/pulp"
 pulp_settings_file: "{{ pulp_config_dir }}/settings.py"
+pulp_install_dir: '/usr/local/lib/pulp'
+pulp_user: pulp
diff --git a/roles/pulp_resource_manager/meta/main.yml b/roles/pulp_resource_manager/meta/main.yml
@@ -21,5 +21,3 @@ galaxy_info:
   galaxy_tags:
     - pulp
     - pulpcore
-dependencies:
-  - pulp_redis
diff --git a/roles/pulp_workers/defaults/main.yml b/roles/pulp_workers/defaults/main.yml
@@ -3,3 +3,5 @@ pulp_config_dir: "/etc/pulp"
 pulp_settings_file: "{{ pulp_config_dir }}/settings.py"
 pulp_group: pulp
 pulp_workers: 2
+pulp_install_dir: '/usr/local/lib/pulp'
+pulp_user: pulp
diff --git a/roles/pulp_workers/meta/main.yml b/roles/pulp_workers/meta/main.yml
@@ -21,5 +21,3 @@ galaxy_info:
   galaxy_tags:
     - pulp
     - pulpcore
-dependencies:
-  - pulp_redis