Merge branch 'devel' into devel

This commit is contained in:
mo-saeed
2020-06-06 00:19:19 +02:00
committed by GitHub
172 changed files with 4810 additions and 1885 deletions

View File

@@ -9,10 +9,10 @@ admin_password: ''
kubernetes_base_path: "{{ local_base_config_path|default('/tmp') }}/{{ kubernetes_deployment_name }}-config"
kubernetes_task_version: "{{ tower_package_version | default(dockerhub_version) }}"
kubernetes_task_image: "{{ tower_package_name | default('ansible/awx_task') }}"
kubernetes_web_version: "{{ tower_package_version | default(dockerhub_version) }}"
kubernetes_web_image: "{{ tower_package_name | default('ansible/awx_web') }}"
kubernetes_awx_image: "{{ tower_package_name | default('ansible/awx') }}"
kubernetes_web_image: "{{ kubernetes_awx_image }}"
kubernetes_task_image: "{{ kubernetes_awx_image }}"
awx_psp_create: false
awx_psp_name: 'awx'