From aef500d9c9e1d2257b73a191eda8d4976b467475 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Thu, 4 Jun 2020 09:22:56 -0400 Subject: [PATCH] Fixing up molecule * Limiting resources so that things can start in travis * Making a dedicated molecule test CR --- .../tower_v1alpha1_tower_cr_molecule.yaml | 38 +++++++++++++++++++ molecule/test-local/converge.yml | 2 +- roles/tower/tasks/main.yml | 14 ------- 3 files changed, 39 insertions(+), 15 deletions(-) create mode 100644 deploy/crds/tower_v1alpha1_tower_cr_molecule.yaml diff --git a/deploy/crds/tower_v1alpha1_tower_cr_molecule.yaml b/deploy/crds/tower_v1alpha1_tower_cr_molecule.yaml new file mode 100644 index 00000000..8a318611 --- /dev/null +++ b/deploy/crds/tower_v1alpha1_tower_cr_molecule.yaml @@ -0,0 +1,38 @@ +--- +apiVersion: tower.ansible.com/v1alpha1 +kind: Tower +metadata: + name: example-tower + namespace: example-tower +spec: + deployment_type: awx + tower_ingress_type: ingress + tower_task_privileged: false + + tower_hostname: example-tower.test + tower_secret_key: aabbcc + tower_broadcast_websocket_secret: changeme + + tower_admin_user: test + tower_admin_email: test@example.com + tower_admin_password: changeme + + tower_task_image: ansible/awx_task:11.2.0 + tower_web_image: ansible/awx_web:11.2.0 + + tower_task_mem_request: 128M + tower_task_cpu_request: 500m + + tower_web_mem_request: 128M + tower_web_cpu_request: 500m + + tower_create_preload_data: true + + tower_memcached_image: memcached:alpine + + tower_redis_image: redis:latest + + tower_postgres_pass: awxpass + tower_postgres_image: postgres:10 + tower_postgres_storage_request: 8Gi + tower_postgres_storage_class: '' diff --git a/molecule/test-local/converge.yml b/molecule/test-local/converge.yml index 017840fb..9be37beb 100644 --- a/molecule/test-local/converge.yml +++ b/molecule/test-local/converge.yml @@ -26,7 +26,7 @@ deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy" pull_policy: Never operator_image: tower.ansible.com/tower-operator:testing - custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1alpha1_tower_cr_awx.yaml'])) | from_yaml }}" + custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1alpha1_tower_cr_molecule.yaml'])) | from_yaml }}" tasks: diff --git a/roles/tower/tasks/main.yml b/roles/tower/tasks/main.yml index b2909741..71a2d461 100644 --- a/roles/tower/tasks/main.yml +++ b/roles/tower/tasks/main.yml @@ -54,17 +54,3 @@ when: (k8s_defs_result is changed) or (database_check is defined and database_check.rc != 0) - include_tasks: initialize.yml - -- name: Scale the tower deployment to 0 replicas after migration. - k8s: - definition: "{{ lookup('template', 'tower.yaml.j2') | from_yaml_all | list }}" - vars: - tower_replicas: "0" - when: migrate_result and migrate_result.changed - -- name: Scale the tower deployment back to 1 replica after migration. - k8s: - definition: "{{ lookup('template', 'tower.yaml.j2') | from_yaml_all | list }}" - vars: - tower_replicas: "1" - when: migrate_result and migrate_result.changed