merge and resolve conflicts

installer/roles/image_build/templates/launch_awx_task.sh.j2

@@ -12,6 +12,8 @@ ANSIBLE_REMOTE_TEMP=/tmp ANSIBLE_LOCAL_TEMP=/tmp ansible -i "127.0.0.1," -c loca
 
 if [ -z "$AWX_SKIP_MIGRATIONS" ]; then
     awx-manage migrate --noinput
+    awx-manage provision_instance --hostname=$(hostname)
+    awx-manage register_queue --queuename=tower --instance_percent=100
 fi
 
 if [ ! -z "$AWX_ADMIN_USER" ]&&[ ! -z "$AWX_ADMIN_PASSWORD" ]; then
@@ -21,8 +23,6 @@ if [ ! -z "$AWX_ADMIN_USER" ]&&[ ! -z "$AWX_ADMIN_PASSWORD" ]; then
     {% endif %}
 fi
 echo 'from django.conf import settings; x = settings.AWX_TASK_ENV; x["HOME"] = "/var/lib/awx"; settings.AWX_TASK_ENV = x' | awx-manage shell
-awx-manage provision_instance --hostname=$(hostname)
-awx-manage register_queue --queuename=tower --instance_percent=100
 
 unset $(cut -d = -f -1 /etc/tower/conf.d/environment.sh)
 

installer/roles/kubernetes/defaults/main.yml

@@ -38,15 +38,6 @@ kubernetes_redis_image: "redis"
 kubernetes_redis_image_tag: "latest"
 kubernetes_redis_config_mount_path: "/usr/local/etc/redis/redis.conf"
 
-memcached_mem_request: 1
-memcached_cpu_request: 500
-memcached_security_context_enabled: true
-memcached_security_context_privileged: false
-memcached_security_context_user: 1001
-
-kubernetes_memcached_version: "latest"
-kubernetes_memcached_image: "memcached"
-
 openshift_pg_emptydir: false
 openshift_pg_pvc_name: postgresql
 

installer/roles/kubernetes/templates/deployment.yml.j2

@@ -231,9 +231,6 @@ spec:
             - name: {{ kubernetes_deployment_name }}-redis-socket
               mountPath: "/var/run/redis"
 
-            - name: {{ kubernetes_deployment_name }}-memcached-socket
-              mountPath: "/var/run/memcached"
-
           resources:
             requests:
               memory: "{{ web_mem_request }}Gi"
@@ -310,9 +307,6 @@ spec:
 
             - name: {{ kubernetes_deployment_name }}-redis-socket
               mountPath: "/var/run/redis"
-
-            - name: {{ kubernetes_deployment_name }}-memcached-socket
-              mountPath: "/var/run/memcached"
           env:
             - name: SUPERVISOR_WEB_CONFIG_PATH
               value: "/etc/supervisord.conf"
@@ -376,40 +370,6 @@ spec:
 {% endif %}
 {% if redis_cpu_limit is defined %}
               cpu: "{{ redis_cpu_limit }}m"
-{% endif %}
-        - name: {{ kubernetes_deployment_name }}-memcached
-{% if memcached_security_context_enabled is defined and memcached_security_context_enabled | bool %}
-          securityContext:
-{% if memcached_security_context_privileged is defined %}
-            privileged: {{ memcached_security_context_privileged }}
-{% endif %}
-{% if memcached_security_context_user is defined %}
-            runAsUser: {{ memcached_security_context_user }}
-{% endif %}
-{% endif %}
-          image: "{{ kubernetes_memcached_image }}:{{ kubernetes_memcached_version }}"
-          imagePullPolicy: Always
-          command:
-            - 'memcached'
-            - '-s'
-            - '/var/run/memcached/memcached.sock'
-            - '-a'
-            - '0666'
-          volumeMounts:
-            - name: {{ kubernetes_deployment_name }}-memcached-socket
-              mountPath: "/var/run/memcached"
-          resources:
-            requests:
-              memory: "{{ memcached_mem_request }}Gi"
-              cpu: "{{ memcached_cpu_request }}m"
-{% if memcached_mem_limit is defined or memcached_cpu_limit is defined %}
-            limits:
-{% endif %}
-{% if memcached_mem_limit is defined %}
-              memory: "{{ memcached_mem_limit }}Gi"
-{% endif %}
-{% if memcached_cpu_limit is defined %}
-              cpu: "{{ memcached_cpu_limit }}m"
 {% endif %}
 {% if tolerations is defined %}
       tolerations:
@@ -516,9 +476,6 @@ spec:
         - name: {{ kubernetes_deployment_name }}-redis-socket
           emptyDir: {}
 
-        - name: {{ kubernetes_deployment_name }}-memcached-socket
-          emptyDir: {}
-
 ---
 apiVersion: v1
 kind: Service
@@ -591,4 +548,4 @@ spec:
     name: {{ kubernetes_deployment_name }}-web-svc
     weight: 100
   wildcardPolicy: None
-{% endif %}
+{% endif %}

installer/roles/local_docker/defaults/main.yml

@@ -7,7 +7,4 @@ redis_image: "redis"
 postgresql_version: "10"
 postgresql_image: "postgres:{{postgresql_version}}"
 
-memcached_image: "memcached"
-memcached_version: "alpine"
-
 compose_start_containers: true

installer/roles/local_docker/tasks/compose.yml

@@ -10,12 +10,6 @@
     state: directory
     mode: 0777
 
-- name: Create Memcached socket directory
-  file:
-    path: "{{ docker_compose_dir }}/memcached_socket"
-    state: directory
-    mode: 0777
-
 - name: Create Docker Compose Configuration
   template:
     src: "{{ item }}.j2"

installer/roles/local_docker/templates/docker-compose.yml.j2

@@ -7,7 +7,6 @@ services:
     container_name: awx_web
     depends_on:
       - redis
-      - memcached
       {% if pg_hostname is not defined %}
       - postgres
       {% endif %}
@@ -32,7 +31,6 @@ services:
       - "{{ docker_compose_dir }}/credentials.py:/etc/tower/conf.d/credentials.py"
       - "{{ docker_compose_dir }}/nginx.conf:/etc/nginx/nginx.conf:ro"
       - "{{ docker_compose_dir }}/redis_socket:/var/run/redis/:rw"
-      - "{{ docker_compose_dir }}/memcached_socket:/var/run/memcached/:rw"
     {% if project_data_dir is defined %}
       - "{{ project_data_dir +':/var/lib/awx/projects:rw' }}"
     {% endif %}
@@ -76,7 +74,6 @@ services:
     container_name: awx_task
     depends_on:
       - redis
-      - memcached
       - web
       {% if pg_hostname is not defined %}
       - postgres
@@ -93,7 +90,6 @@ services:
       - "{{ docker_compose_dir }}/environment.sh:/etc/tower/conf.d/environment.sh"
       - "{{ docker_compose_dir }}/credentials.py:/etc/tower/conf.d/credentials.py"
       - "{{ docker_compose_dir }}/redis_socket:/var/run/redis/:rw"
-      - "{{ docker_compose_dir }}/memcached_socket:/var/run/memcached/:rw"
     {% if project_data_dir is defined %}
       - "{{ project_data_dir +':/var/lib/awx/projects:rw' }}"
     {% endif %}
@@ -142,19 +138,6 @@ services:
     volumes:
       - "{{ docker_compose_dir }}/redis.conf:/usr/local/etc/redis/redis.conf:ro"
       - "{{ docker_compose_dir }}/redis_socket:/var/run/redis/:rw"
-      - "{{ docker_compose_dir }}/memcached_socket:/var/run/memcached/:rw"
-
-  memcached:
-    image: "{{ memcached_image }}:{{ memcached_version }}"
-    container_name: awx_memcached
-    command: ["-s", "/var/run/memcached/memcached.sock", "-a", "0666"]
-    restart: unless-stopped
-    environment:
-      http_proxy: {{ http_proxy | default('') }}
-      https_proxy: {{ https_proxy | default('') }}
-      no_proxy: {{ no_proxy | default('') }}
-    volumes:
-      - "{{ docker_compose_dir }}/memcached_socket:/var/run/memcached/:rw"
 
   {% if pg_hostname is not defined %}
   postgres: