diff --git a/installer/install.yml b/installer/install.yml index 90a8dc911c..ff10a6074f 100644 --- a/installer/install.yml +++ b/installer/install.yml @@ -1,7 +1,6 @@ --- - name: Build and deploy AWX hosts: all - gather_facts: false roles: - { role: check_vars } - { role: image_build, when: "dockerhub_base is not defined" } diff --git a/installer/roles/local_docker/defaults/main.yml b/installer/roles/local_docker/defaults/main.yml index 8d4d015bff..e145e3559a 100644 --- a/installer/roles/local_docker/defaults/main.yml +++ b/installer/roles/local_docker/defaults/main.yml @@ -12,4 +12,3 @@ rabbitmq_default_password: "guest" postgresql_version: "9.6" postgresql_image: "postgres:{{postgresql_version}}" -docker_compose_dir: "/var/lib/awx" diff --git a/installer/roles/local_docker/tasks/compose.yml b/installer/roles/local_docker/tasks/compose.yml index 6fda66ffed..ab896396aa 100644 --- a/installer/roles/local_docker/tasks/compose.yml +++ b/installer/roles/local_docker/tasks/compose.yml @@ -1,4 +1,13 @@ --- +- include_vars: '{{ item }}' + with_first_found: + - files: + - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml' # CentOS-7 + - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml' # RedHat-7 + - '{{ ansible_distribution }}.yml' # CentOS + - '{{ ansible_os_family }}.yml' # RedHat + - 'default.yml' + - name: Create {{ docker_compose_dir }} directory file: path: "{{ docker_compose_dir }}" @@ -33,7 +42,7 @@ docker_service: project_src: "{{ docker_compose_dir }}" register: awx_compose_start - + - name: Update CA trust in awx_web container command: docker exec awx_web_1 '/usr/bin/update-ca-trust' when: awx_compose_config.changed or awx_compose_start.changed diff --git a/installer/roles/local_docker/vars/Darwin.yml b/installer/roles/local_docker/vars/Darwin.yml new file mode 100644 index 0000000000..168547c338 --- /dev/null +++ b/installer/roles/local_docker/vars/Darwin.yml @@ -0,0 +1 @@ +docker_compose_dir: "/usr/local/var/lib/awx" diff --git a/installer/roles/local_docker/vars/default.yml b/installer/roles/local_docker/vars/default.yml new file mode 100644 index 0000000000..56676b99d7 --- /dev/null +++ b/installer/roles/local_docker/vars/default.yml @@ -0,0 +1 @@ +docker_compose_dir: "/var/lib/awx"