From cf633d6ec2cbfda3c1aecc851ee9e4bc0f65b18c Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Thu, 21 Jan 2021 13:15:14 -0500 Subject: [PATCH] Remove deployment_type --- README.md | 1 - ansible/instantiate-awx-deployment.yml | 1 - ansible/templates/crd.yml.j2 | 5 ----- deploy/awx-operator.yaml | 5 ----- deploy/crds/awx_v1beta1_cr.yaml | 1 - deploy/crds/awx_v1beta1_crd.yaml | 5 ----- deploy/crds/awx_v1beta1_molecule.yaml | 1 - .../manifests/awx-operator.clusterserviceversion.yaml | 2 -- .../awx-operator/manifests/awx.ansible.com_awxs_crd.yaml | 5 ----- roles/awx/tasks/main.yml | 3 --- roles/awx/vars/awx.yml | 2 -- roles/awx/vars/tower.yml | 2 -- 12 files changed, 33 deletions(-) delete mode 100644 roles/awx/vars/awx.yml delete mode 100644 roles/awx/vars/tower.yml diff --git a/README.md b/README.md index bf02f0aa..970bc6e9 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,6 @@ Then you can create instances of AWX, for example: name: awx namespace: ansible-awx spec: - deployment_type: awx tower_admin_user: test tower_admin_email: test@example.com tower_admin_password: changeme diff --git a/ansible/instantiate-awx-deployment.yml b/ansible/instantiate-awx-deployment.yml index c68e3138..0ac89e4c 100644 --- a/ansible/instantiate-awx-deployment.yml +++ b/ansible/instantiate-awx-deployment.yml @@ -18,7 +18,6 @@ metadata: name: awx spec: - deployment_type: awx tower_admin_user: test tower_admin_email: test@example.com tower_admin_password: changeme diff --git a/ansible/templates/crd.yml.j2 b/ansible/templates/crd.yml.j2 index d6fa6c70..768dcfaa 100644 --- a/ansible/templates/crd.yml.j2 +++ b/ansible/templates/crd.yml.j2 @@ -26,9 +26,6 @@ spec: spec: type: object properties: - deployment_type: - type: string - pattern: "^(tower|awx)(-)?.*$" external_database: type: boolean description: | @@ -51,5 +48,3 @@ spec: username: password: type: Opaque - required: - - deployment_type diff --git a/deploy/awx-operator.yaml b/deploy/awx-operator.yaml index cfc1cbcc..81e6ef4d 100644 --- a/deploy/awx-operator.yaml +++ b/deploy/awx-operator.yaml @@ -169,9 +169,6 @@ spec: spec: type: object properties: - deployment_type: - type: string - pattern: "^(tower|awx)(-)?.*$" external_database: type: boolean description: | @@ -194,5 +191,3 @@ spec: username: password: type: Opaque - required: - - deployment_type diff --git a/deploy/crds/awx_v1beta1_cr.yaml b/deploy/crds/awx_v1beta1_cr.yaml index 09e7fd4c..973ae2a1 100644 --- a/deploy/crds/awx_v1beta1_cr.yaml +++ b/deploy/crds/awx_v1beta1_cr.yaml @@ -5,7 +5,6 @@ metadata: name: example-awx namespace: example-awx spec: - deployment_type: awx tower_ingress_type: none tower_task_privileged: false diff --git a/deploy/crds/awx_v1beta1_crd.yaml b/deploy/crds/awx_v1beta1_crd.yaml index d6fa6c70..768dcfaa 100644 --- a/deploy/crds/awx_v1beta1_crd.yaml +++ b/deploy/crds/awx_v1beta1_crd.yaml @@ -26,9 +26,6 @@ spec: spec: type: object properties: - deployment_type: - type: string - pattern: "^(tower|awx)(-)?.*$" external_database: type: boolean description: | @@ -51,5 +48,3 @@ spec: username: password: type: Opaque - required: - - deployment_type diff --git a/deploy/crds/awx_v1beta1_molecule.yaml b/deploy/crds/awx_v1beta1_molecule.yaml index 24f68d28..b004d4fa 100644 --- a/deploy/crds/awx_v1beta1_molecule.yaml +++ b/deploy/crds/awx_v1beta1_molecule.yaml @@ -5,7 +5,6 @@ metadata: name: example-awx namespace: example-awx spec: - deployment_type: awx tower_ingress_type: ingress tower_task_privileged: false diff --git a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml index b7cbf7a3..53418b0e 100644 --- a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml @@ -13,7 +13,6 @@ metadata: "namespace": "example-awx" }, "spec": { - "deployment_type": "awx", "tower_admin_email": "test@example.com", "tower_admin_password": "changeme", "tower_admin_user": "test", @@ -42,7 +41,6 @@ metadata: "namespace": "example-awx" }, "spec": { - "deployment_type": "awx", "tower_admin_email": "test@example.com", "tower_admin_password": "changeme", "tower_admin_user": "test", diff --git a/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml b/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml index cc72af22..51517651 100644 --- a/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml +++ b/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml @@ -20,9 +20,6 @@ spec: properties: spec: properties: - deployment_type: - pattern: ^(tower|awx)(-)?.*$ - type: string external_database: description: | If true you must supply a secret containing the location and credentials for @@ -45,8 +42,6 @@ spec: password: type: Opaque type: boolean - required: - - deployment_type type: object type: object version: v1beta1 diff --git a/roles/awx/tasks/main.yml b/roles/awx/tasks/main.yml index 8b19b5ff..01aa45f0 100644 --- a/roles/awx/tasks/main.yml +++ b/roles/awx/tasks/main.yml @@ -1,7 +1,4 @@ --- -- name: Include deployment type vars - include_vars: "{{ deployment_type }}.yml" - - name: Check for existing secret key k8s_info: kind: Secret diff --git a/roles/awx/vars/awx.yml b/roles/awx/vars/awx.yml deleted file mode 100644 index 077d023f..00000000 --- a/roles/awx/vars/awx.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -uwsgi_bash: "bash -c" diff --git a/roles/awx/vars/tower.yml b/roles/awx/vars/tower.yml deleted file mode 100644 index e6ff3545..00000000 --- a/roles/awx/vars/tower.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -uwsgi_bash: "scl enable rh-postgresql10"