From ba9422e9c6fa16d198f42b00bf7fa6d5068e451f Mon Sep 17 00:00:00 2001
From: David Davis <daviddavis@redhat.com>
Date: Wed, 5 Dec 2018 14:53:51 -0500
Subject: [PATCH] Updating installer to install new pulpcore-plugin repo

https://pulp.plan.io/issues/4192
ref #4192
---
 README.md                     |  1 +
 roles/pulp3/tasks/install.yml | 15 ++++++++++-----
 source-install.yml            |  1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index eeff0ae94..c675617e9 100644
--- a/README.md
+++ b/README.md
@@ -122,6 +122,7 @@ a single parent directory.
 ```
 $ git clone https://github.com/pulp/ansible-pulp3.git
 $ git clone https://github.com/pulp/pulp.git
+$ git clone https://github.com/pulp/pulpcore-plugin.git
 $ git clone https://github.com/pulp/pulp_file.git
 ```
 
diff --git a/roles/pulp3/tasks/install.yml b/roles/pulp3/tasks/install.yml
index ecc609f9e..a0a2bca05 100644
--- a/roles/pulp3/tasks/install.yml
+++ b/roles/pulp3/tasks/install.yml
@@ -65,17 +65,22 @@
         virtualenv: '{{ pulp_install_dir }}'
         virtualenv_command: '{{ pulp_python_interpreter }} -m venv'
 
-    - name: Install pulpcore packages from source
+    - name: Install pulpcore package from source
       pip:
-        name: '{{ pulp_source_dir }}/{{ item }}'
+        name: '{{ pulp_source_dir }}'
         editable: yes
         virtualenv: '{{ pulp_install_dir }}'
         virtualenv_command: '{{ pulp_python_interpreter }} -m venv'
-      with_items:
-        - pulpcore
-        - plugin
       when: pulp_source_dir is defined
 
+    - name: Install pulpcore-plugin package from source
+      pip:
+        name: '{{ pulp_plugin_source_dir }}'
+        editable: yes
+        virtualenv: '{{ pulp_install_dir }}'
+        virtualenv_command: '{{ pulp_python_interpreter }} -m venv'
+      when: pulp_plugin_source_dir is defined
+
     - name: Install Pulp plugins via PyPI
       pip:
         name: '{{ item.key }}'
diff --git a/source-install.yml b/source-install.yml
index 307ecb45b..754ecd126 100644
--- a/source-install.yml
+++ b/source-install.yml
@@ -2,6 +2,7 @@
 - hosts: all
   vars:
     pulp_source_dir: "/home/vagrant/devel/pulp"
+    pulp_plugin_source_dir: "/home/vagrant/devel/pulpcore-plugin"
     pulp_secret_key: "unsafe_default"
     pulp_default_admin_password: password
     pulp_install_plugins: