Remove unneeded roles from the installer directory

tools/docker-compose/README.md

@@ -4,18 +4,18 @@
 
 Here are the main make targets:
 
-* `docker-compose-build` - used for building the development image, which is used by both `docker-compose`
-* `docker-compose` - Make target for development, passes awx_devel image and tag.  
+* `docker-compose-build` - used for building the development image, which is used by the `docker-compose` target
+* `docker-compose` - make target for development, passes awx_devel image and tag
 
 Notable files:
-* `tools/docker-compose/inventory` file - used to configure the local AWX development deployment.  
-* `migrate.yml` - playbook for migrating data from Local Docker to the Development Environment.  
+* `tools/docker-compose/inventory` file - used to configure the local AWX development deploymen
+* `migrate.yml` - playbook for migrating data from Local Docker to the Development Environment  
 
 ### Prerequisites
 
 - [Docker](https://docs.docker.com/engine/installation/) on the host where AWX will be deployed. After installing Docker, the Docker service must be started (depending on your OS, you may have to add the local user that uses Docker to the ``docker`` group, refer to the documentation for details)
 - [docker-compose](https://pypi.org/project/docker-compose/) Python module.
-    + This also installs the `docker` Python module, which is incompatible with `docker-py`. If you have previously installed `docker-py`, please uninstall it.
+    + This also installs the `docker` Python module, which is incompatible with [`docker-py`](https://pypi.org/project/docker-py/). If you have previously installed `docker-py`, please uninstall it.
 - [Docker Compose](https://docs.docker.com/compose/install/).
 
 ## Configuration

tools/docker-compose/ansible/roles/migrate/tasks/migrate-from-local-docker.yml

@@ -4,6 +4,7 @@
 - name: Remove awx_postgres to ensure consistent start state
   shell: |
     docker rm -f awx_postgres
+  ignore_errors: true
 
 - name: Start Local Docker database container
   docker_compose:
@@ -13,6 +14,10 @@
     state: present
     recreate: always
 
+- name: Wait for postgres to initialize
+  wait_for:
+    timeout: 3
+
 - name: Database dump to local filesystem
   shell: |
     docker-compose -f {{ old_docker_compose_dir }}/docker-compose.yml exec -T postgres pg_dumpall -U {{ pg_username }} > awx_dump.sql

tools/docker-compose/ansible/roles/sources/templates/docker-credential-plugins-override.yml

@@ -1,31 +0,0 @@
----
-version: '2'
-services:
-  # Primary Tower Development Container link
-  awx:
-    links:
-      - hashivault
-      - conjur
-  hashivault:
-    image: vault
-    container_name: tools_hashivault_1
-    ports:
-      - '8200:8200'
-    cap_add:
-      - IPC_LOCK
-    environment:
-      VAULT_DEV_ROOT_TOKEN_ID: 'vaultdev'
-
-  conjur:
-    image: cyberark/conjur
-    container_name: tools_conjur_1
-    command: server -p 8300
-    environment:
-      DATABASE_URL: postgres://awx@postgres/postgres
-      CONJUR_DATA_KEY: 'dveUwOI/71x9BPJkIgvQRRBF3SdASc+HP4CUGL7TKvM='
-    depends_on:
-      - postgres
-    links:
-      - postgres
-    ports:
-      - "8300:8300"