Merge pull request #141 from billett83/devel

fixes #140 - Allow for private hosted awx-ee image

README.md

@@ -240,11 +240,12 @@ spec:
 
 There are a few variables that are customizable for awx the image management.
 
-| Name                    | Description                | Default            |
-| ----------------------- | -------------------------- | ------------------ |
-| tower_image             | Path of the image to pull  | ansible/awx:15.0.0 |
-| tower_image_pull_policy | The pull policy to adopt   | IfNotPresent       |
-| tower_image_pull_secret | The pull secret to use     | ''                 |
+| Name                    | Description                | Default              |
+| ----------------------- | -------------------------- | -------------------- |
+| tower_image             | Path of the image to pull  | ansible/awx:15.0.0   |
+| tower_image_pull_policy | The pull policy to adopt   | IfNotPresent         |
+| tower_image_pull_secret | The pull secret to use     | ''                   |
+| tower_ee_image          | Path of the image to pull  | ansible/awx-ee:latest|
 
 Example of customization could be:
 
@@ -255,6 +256,7 @@ spec:
   tower_image: myorg/my-custom-awx
   tower_image_pull_policy: Always
   tower_image_pull_secret: pull_secret_name
+  tower_ee_image: myorg/my-custom-awx-ee
 ```
 
 #### Privileged Tasks

deploy/awx-operator.yaml

@@ -348,6 +348,9 @@ spec:
                   type: string
                 tower_web_extra_volume_mounts:
                   type: string
+                tower_ee_image:
+                  description: Registry path to the Execution Environment container to use
+                  type: string
                 tower_redis_image:
                   description: Registry path to the redis container to use
                   type: string

deploy/crds/awx_v1beta1_cr.yaml

@@ -15,6 +15,8 @@ spec:
 
   tower_image: quay.io/ansible/awx:18.0.0
 
+  tower_ee_image: quay.io/ansible/awx-ee:latest
+
   tower_create_preload_data: true
 
   tower_memcached_image: memcached:alpine

deploy/crds/awx_v1beta1_crd.yaml

@@ -197,6 +197,9 @@ spec:
                   type: string
                 tower_web_extra_volume_mounts:
                   type: string
+                tower_ee_image:
+                  description: Registry path to the Execution Environment container to use
+                  type: string
                 tower_redis_image:
                   description: Registry path to the redis container to use
                   type: string

deploy/crds/awx_v1beta1_molecule.yaml

@@ -13,6 +13,8 @@ spec:
 
   tower_image: quay.io/ansible/awx:18.0.0
 
+  tower_ee_image: quay.io/ansible/awx-ee:latest
+
   tower_web_resource_requirements:
     requests:
       cpu: 500m

deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml

@@ -19,6 +19,7 @@ metadata:
             "tower_hostname": "example-awx.test",
             "tower_image": "quay.io/ansible/awx:18.0.0",
             "tower_ingress_type": "none",
+            "tower_ee_image": "quay.io/ansible/awx-ee:latest",
             "tower_memcached_image": "memcached:alpine",
             "tower_postgres_storage_class": "",
             "tower_redis_image": "redis:latest",
@@ -360,7 +361,7 @@ spec:
                   value: awx-operator
                 - name: ANSIBLE_GATHERING
                   value: explicit
-                image: quay.io/ansible/awx-operator:0.6.0
+                image: quay.io/ansible/awx-operator:0.7.0
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:

deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml

@@ -136,6 +136,9 @@ spec:
               tower_postgres_storage_class:
                 description: Storage class to use for the PostgreSQL PVC
                 type: string
+              tower_ee_image:
+                description: Registry path to the Execution Environment container to use
+                type: string
               tower_redis_image:
                 description: Registry path to the redis container to use
                 type: string

roles/installer/defaults/main.yml

@@ -68,7 +68,7 @@ tower_extra_volumes: ''
 tower_image: quay.io/ansible/awx:18.0.0
 tower_image_pull_policy: IfNotPresent
 tower_image_pull_secret: ''
-default_ee: quay.io/ansible/awx-ee
+tower_ee_image: quay.io/ansible/awx-ee
 
 tower_create_preload_data: true
 

roles/installer/templates/tower_deployment.yaml.j2

@@ -167,7 +167,7 @@ spec:
             {{ tower_task_extra_env | indent(width=12, indentfirst=True) }}
 {% endif %}
           resources: {{ tower_task_resource_requirements }}
-        - image: '{{ default_ee }}'
+        - image: '{{ tower_ee_image }}'
           name: '{{ meta.name }}-ee'
           imagePullPolicy: '{{ tower_image_pull_policy }}'
           args: ['receptor', '--config', '/etc/receptor.conf']