External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-24 14:36:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

Allow for platform specific variables in docker-compose install

Browse Source 
This changes the default docker_compose_dir on macos to a writeable location
This commit is contained in:
Shane McDonald
2019-03-27 09:32:04 -04:00
parent a6d031f46f
commit c44bf6f903
5 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
installer/install.yml
View File

@@ -1,7 +1,6 @@
--- ---
- name: Build and deploy AWX - name: Build and deploy AWX
hosts: all hosts: all
gather_facts: false
roles: roles:
- { role: check_vars } - { role: check_vars }
- { role: image_build, when: "dockerhub_base is not defined" } - { role: image_build, when: "dockerhub_base is not defined" }

1
installer/roles/local_docker/defaults/main.yml
View File

@@ -12,4 +12,3 @@ rabbitmq_default_password: "guest"
postgresql_version: "9.6" postgresql_version: "9.6"
postgresql_image: "postgres:{{postgresql_version}}" postgresql_image: "postgres:{{postgresql_version}}"
docker_compose_dir: "/var/lib/awx"

11
installer/roles/local_docker/tasks/compose.yml
View File

@@ -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 - name: Create {{ docker_compose_dir }} directory
file: file:
path: "{{ docker_compose_dir }}" path: "{{ docker_compose_dir }}"
@@ -33,7 +42,7 @@
docker_service: docker_service:
project_src: "{{ docker_compose_dir }}" project_src: "{{ docker_compose_dir }}"
register: awx_compose_start register: awx_compose_start
- name: Update CA trust in awx_web container - name: Update CA trust in awx_web container
command: docker exec awx_web_1 '/usr/bin/update-ca-trust' command: docker exec awx_web_1 '/usr/bin/update-ca-trust'
when: awx_compose_config.changed or awx_compose_start.changed when: awx_compose_config.changed or awx_compose_start.changed

1
installer/roles/local_docker/vars/Darwin.yml Normal file
View File

@@ -0,0 +1 @@
docker_compose_dir: "/usr/local/var/lib/awx"

1
installer/roles/local_docker/vars/default.yml Normal file
View File

@@ -0,0 +1 @@
docker_compose_dir: "/var/lib/awx"