Clean up instances of tower_ee_image

This commit is contained in:
Shane McDonald
2021-04-05 15:50:29 -04:00
parent c9acc30009
commit bac795a36a
3 changed files with 9 additions and 15 deletions

View File

@@ -250,12 +250,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 | '' |
| tower_ee_image | Path of the image to pull | ansible/awx-ee:latest|
| Name | Description |
| ----------------------- | -------------------------- |
| tower_image | Path of the image to pull |
| tower_image_pull_policy | The pull policy to adopt |
| tower_image_pull_secret | The pull secret to use |
| tower_ee_images | A list of EEs to register |
Example of customization could be:
@@ -266,7 +266,9 @@ 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
tower_ee_images:
- name: my-custom-awx-ee
image: myorg/my-custom-awx-ee
```
#### Privileged Tasks

View File

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

View File

@@ -15,7 +15,6 @@ metadata:
"deployment_type": "awx",
"tower_admin_email": "test@example.com",
"tower_create_preload_data": true,
"tower_ee_image": "quay.io/ansible/awx-ee:0.1.1",
"tower_image": "quay.io/ansible/awx:18.0.0",
"tower_ingress_type": "ingress",
"tower_memcached_image": "memcached:alpine",
@@ -209,11 +208,6 @@ spec:
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced
- urn:alm:descriptor:com.tectonic.ui:hidden
- displayName: Tower EE Image
path: tower_ee_image
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced
- urn:alm:descriptor:com.tectonic.ui:hidden
- displayName: Redis Image
path: tower_redis_image
x-descriptors: