diff --git a/ansible/group_vars/all b/ansible/group_vars/all index cc78b760..fb44aacd 100644 --- a/ansible/group_vars/all +++ b/ansible/group_vars/all @@ -1,3 +1,3 @@ operator_image: quay.io/ansible/awx-operator -operator_version: 0.8.0 +operator_version: 0.9.0 pull_policy: Always diff --git a/ansible/instantiate-awx-deployment.yml b/ansible/instantiate-awx-deployment.yml index 3c7b761c..f5195185 100644 --- a/ansible/instantiate-awx-deployment.yml +++ b/ansible/instantiate-awx-deployment.yml @@ -18,10 +18,11 @@ metadata: name: awx spec: - tower_admin_user: test - tower_admin_email: test@example.com + tower_admin_user: admin + tower_admin_email: admin@localhost tower_ingress_type: "{{ tower_ingress_type | default(omit) }}" # Either Route, Ingress or LoadBalancer tower_image: "{{ tower_image | default(omit) }}" + tower_image_version: "{{ tower_image_version | default(omit) }}" development_mode: "{{ development_mode | default(omit) | bool }}" tower_image_pull_policy: "{{ tower_image_pull_policy | default(omit) }}" # tower_ee_images: diff --git a/deploy/awx-operator.yaml b/deploy/awx-operator.yaml index 2cd87de5..7c1f3636 100644 --- a/deploy/awx-operator.yaml +++ b/deploy/awx-operator.yaml @@ -499,7 +499,7 @@ spec: serviceAccountName: awx-operator containers: - name: awx-operator - image: "quay.io/ansible/awx-operator:0.8.0" + image: "quay.io/ansible/awx-operator:0.9.0" imagePullPolicy: "Always" volumeMounts: - mountPath: /tmp/ansible-operator/runner diff --git a/roles/installer/defaults/main.yml b/roles/installer/defaults/main.yml index dcd5acf4..f5225614 100644 --- a/roles/installer/defaults/main.yml +++ b/roles/installer/defaults/main.yml @@ -84,7 +84,7 @@ tower_extra_volumes: '' # Use these image versions for Ansible AWX. tower_image: quay.io/ansible/awx -tower_image_version: 19.0.0 +tower_image_version: 19.1.0 tower_redis_image: docker.io/redis tower_redis_image_version: latest tower_postgres_image: postgres diff --git a/roles/installer/templates/tower_config.yaml.j2 b/roles/installer/templates/tower_config.yaml.j2 index ff48b596..7b017b1f 100644 --- a/roles/installer/templates/tower_config.yaml.j2 +++ b/roles/installer/templates/tower_config.yaml.j2 @@ -77,7 +77,6 @@ data: LOGGING['loggers']['social']['handlers'] = ['console'] LOGGING['loggers']['system_tracking_migrations']['handlers'] = ['console'] LOGGING['loggers']['rbac_migrations']['handlers'] = ['console'] - LOGGING['loggers']['awx.isolated.manager.playbooks']['handlers'] = ['console'] LOGGING['handlers']['callback_receiver'] = {'class': 'logging.NullHandler'} LOGGING['handlers']['task_system'] = {'class': 'logging.NullHandler'} LOGGING['handlers']['tower_warnings'] = {'class': 'logging.NullHandler'}