From e1e5d04b455c5cde80663d7279591e9dc6a1cf06 Mon Sep 17 00:00:00 2001
From: Dennis Kliban <dkliban@redhat.com>
Date: Mon, 11 Mar 2019 14:58:59 -0400
Subject: [PATCH] Problem: installer depends on non-existing pulp-manager

Solution: use django-admin directly

This patch updates the installer to use djang-admin binary instead of pulp-manager.

re: #4450
https://pulp.plan.io/issues/4450
---
 roles/pulp3-devel/templates/alias.bashrc.j2 | 6 +++---
 roles/pulp3-postgresql/tasks/main.yml       | 8 ++++----
 roles/pulp3/handlers/main.yml               | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/roles/pulp3-devel/templates/alias.bashrc.j2 b/roles/pulp3-devel/templates/alias.bashrc.j2
index e82097b6d..6132799f9 100644
--- a/roles/pulp3-devel/templates/alias.bashrc.j2
+++ b/roles/pulp3-devel/templates/alias.bashrc.j2
@@ -30,9 +30,9 @@ _pstatus_help="Report the status of all pulp-related services"
 
 pclean() {
     workon pulp
-    pulp-manager reset_db --noinput
-    pulp-manager migrate
-    pulp-manager reset-admin-password --password {{ pulp_default_admin_password }}
+    django-admin reset_db --noinput
+    django-admin migrate
+    django-admin reset-admin-password --password {{ pulp_default_admin_password }}
 }
 _pclean_help="Restore pulp to a clean-installed state"
 # can get away with not resetting terminal settings here since it gets reset in phelp
diff --git a/roles/pulp3-postgresql/tasks/main.yml b/roles/pulp3-postgresql/tasks/main.yml
index 1d4d27b97..8b773fed4 100644
--- a/roles/pulp3-postgresql/tasks/main.yml
+++ b/roles/pulp3-postgresql/tasks/main.yml
@@ -63,23 +63,23 @@
       when: pulp_install_plugins[item].source_dir is undefined
 
     - name: Create database migrations for plugins
-      command: '{{ pulp_install_dir }}/bin/pulp-manager makemigrations {{ pulp_install_plugins[item].app_label}}'
+      command: '{{ pulp_install_dir }}/bin/django-admin makemigrations {{ pulp_install_plugins[item].app_label}}'
       with_items: "{{ pulp_install_plugins }}"
       register: result
       changed_when: "'No changes detected in app' not in result.stdout"
 
     - name: Run database auth migrations
-      command: '{{ pulp_install_dir }}/bin/pulp-manager migrate auth --no-input'
+      command: '{{ pulp_install_dir }}/bin/django-admin migrate auth --no-input'
       register: migrate_auth
       changed_when: "'No migrations to apply' not in migrate_auth.stdout"
 
     - name: Run database migrations
-      command: '{{ pulp_install_dir }}/bin/pulp-manager migrate --no-input'
+      command: '{{ pulp_install_dir }}/bin/django-admin migrate --no-input'
       register: result
       changed_when: "'No migrations to apply' not in result.stdout"
 
     - name: Set the Pulp admin user's password
-      command: '{{ pulp_install_dir }}/bin/pulp-manager reset-admin-password --password {{ pulp_default_admin_password }}'
+      command: '{{ pulp_install_dir }}/bin/django-admin reset-admin-password --password {{ pulp_default_admin_password }}'
       no_log: true
       when: pulp_default_admin_password is defined and migrate_auth.changed
 
diff --git a/roles/pulp3/handlers/main.yml b/roles/pulp3/handlers/main.yml
index 5f6cbe590..d16f97739 100644
--- a/roles/pulp3/handlers/main.yml
+++ b/roles/pulp3/handlers/main.yml
@@ -7,7 +7,7 @@
   become: true
 
 - name: Collect static content
-  command: '{{ pulp_install_dir }}/bin/pulp-manager collectstatic --noinput --link'
+  command: '{{ pulp_install_dir }}/bin/django-admin collectstatic --noinput --link'
   register: staticresult
   changed_when: "staticresult.stdout is not search('\n0 static files')"
   become: true