Merge pull request #155 from shanemcd/update-awx-ee

Use newer awx-ee image

README.md

@@ -400,9 +400,9 @@ After it is built, test it on a local cluster:
 ```sh
 #> minikube start --memory 6g --cpus 4
 #> minikube addons enable ingress
-#> kubectl apply -f deploy/awx-operator.yaml
+#> ansible-playbook ansible/deploy-operator.yml
 #> kubectl create namespace example-awx
-#> kubectl apply -f deploy/crds/awx_v1beta1_cr.yaml
+#> ansible-playbook ansible/instantiate-awx-deployment.yml -e tower_namespace=example-awx
 #> <test everything>
 #> minikube delete
 ```

ansible/instantiate-awx-deployment.yml

@@ -9,7 +9,7 @@
     - name: Deploy AWX
       k8s:
         state: "{{ state | default('present') }}"
-        namespace: "{{ namespace | default('default') }}"
+        namespace: "{{ tower_namespace | default('default') }}"
         apply: yes
         wait: yes
         definition:
@@ -22,5 +22,5 @@
             tower_admin_email: test@example.com
             tower_ingress_type: "{{ tower_ingress_type | default(omit) }}"  # Either Route, Ingress or LoadBalancer
             tower_image: "{{ tower_image | default(omit) }}"
-            development_mode: "{{ development_mode | default(omit) }}"
+            development_mode: "{{ (development_mode|bool) | default(omit) }}"
             tower_image_pull_policy: "{{ tower_image_pull_policy | default(omit) }}"

ansible/templates/crd.yml.j2

@@ -107,6 +107,9 @@ spec:
                 tower_image:
                   description: Registry path to the application container to use
                   type: string
+                tower_ee_image:
+                  description: Registry path to the Execution Environment container to use
+                  type: string
                 tower_image_pull_policy:
                   description: The image pull policy
                   type: string

deploy/awx-operator.yaml

@@ -258,6 +258,9 @@ spec:
                 tower_image:
                   description: Registry path to the application container to use
                   type: string
+                tower_ee_image:
+                  description: Registry path to the Execution Environment container to use
+                  type: string
                 tower_image_pull_policy:
                   description: The image pull policy
                   type: string

deploy/crds/awx_v1beta1_cr.yaml

@@ -1,26 +0,0 @@
----
-apiVersion: awx.ansible.com/v1beta1
-kind: AWX
-metadata:
-  name: example-awx
-  namespace: example-awx
-spec:
-  tower_ingress_type: none
-  tower_task_privileged: false
-
-  tower_hostname: example-awx.test
-
-  tower_admin_user: test
-  tower_admin_email: test@example.com
-
-  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
-
-  tower_redis_image: redis:latest
-
-  tower_postgres_storage_class: ''

deploy/crds/awx_v1beta1_crd.yaml

@@ -107,6 +107,9 @@ spec:
                 tower_image:
                   description: Registry path to the application container to use
                   type: string
+                tower_ee_image:
+                  description: Registry path to the Execution Environment container to use
+                  type: string
                 tower_image_pull_policy:
                   description: The image pull policy
                   type: string

deploy/crds/awx_v1beta1_molecule.yaml

@@ -13,7 +13,7 @@ spec:
 
   tower_image: quay.io/ansible/awx:18.0.0
 
-  tower_ee_image: quay.io/ansible/awx-ee:latest
+  tower_ee_image: quay.io/ansible/awx-ee:0.1.1
 
   tower_web_resource_requirements:
     requests:

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

@@ -19,7 +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_ee_image": "quay.io/ansible/awx-ee:0.1.1",
             "tower_memcached_image": "memcached:alpine",
             "tower_postgres_storage_class": "",
             "tower_redis_image": "redis:latest",

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: ''
-tower_ee_image: quay.io/ansible/awx-ee
+tower_ee_image: quay.io/ansible/awx-ee:0.1.1
 
 tower_create_preload_data: true
 

roles/installer/templates/tower_config.yaml.j2

@@ -218,6 +218,7 @@ data:
     - control-service:
         service: control
         filename: /var/run/receptor/receptor.sock
+        permissions: 0660
 
     - local-only: