Whitespace cleanup for installer.

This commit is contained in:
Jeff Geerling
2017-09-07 14:21:28 -07:00
parent 0489d945fb
commit 6abffcb1df
7 changed files with 16 additions and 21 deletions

View File

@@ -1,5 +1,5 @@
# check_docker.yml # check_docker.yml
--- ---
- name: postgres_data_dir should be defined - name: postgres_data_dir should be defined
assert: assert:
that: that:
@@ -12,4 +12,3 @@
that: that:
- host_port is defined and host_port != '' - host_port is defined and host_port != ''
msg: "Set the value of 'host_port' in the inventory file." msg: "Set the value of 'host_port' in the inventory file."

View File

@@ -1,48 +1,48 @@
# check_openshift.yml # check_openshift.yml
--- ---
- name: awx_openshift_project should be defined - name: awx_openshift_project should be defined
assert: assert:
that: that:
- awx_openshift_project is defined and awx_openshift_project != '' - awx_openshift_project is defined and awx_openshift_project != ''
msg: "Set the value of 'awx_openshift_project' in the inventory file." msg: "Set the value of 'awx_openshift_project' in the inventory file."
- name: openshift_user should be defined - name: openshift_user should be defined
assert: assert:
that: that:
- openshift_user is defined and openshift_user != '' - openshift_user is defined and openshift_user != ''
msg: "Set the value of 'openshift_user' in the inventory file." msg: "Set the value of 'openshift_user' in the inventory file."
- name: openshift_password should be defined - name: openshift_password should be defined
assert: assert:
that: that:
- openshift_password is defined and openshift_password != '' - openshift_password is defined and openshift_password != ''
msg: "Set the value of 'openshift_password' in the inventory file." msg: "Set the value of 'openshift_password' in the inventory file."
- name: awx_node_port should be defined - name: awx_node_port should be defined
assert: assert:
that: that:
- awx_node_port is defined and awx_node_port != '' - awx_node_port is defined and awx_node_port != ''
msg: "Set the value of 'awx_node_port' in the inventory file." msg: "Set the value of 'awx_node_port' in the inventory file."
- name: docker_registry should be defined - name: docker_registry should be defined
assert: assert:
that: that:
- docker_registry is defined and docker_registry != '' - docker_registry is defined and docker_registry != ''
msg: "Set the value of 'docker_registry' in the inventory file." msg: "Set the value of 'docker_registry' in the inventory file."
- name: docker_registry_repository should be defined - name: docker_registry_repository should be defined
assert: assert:
that: that:
- docker_registry_repository is defined and docker_registry_repository != '' - docker_registry_repository is defined and docker_registry_repository != ''
msg: "Set the value of 'docker_registry_repository' in the inventory file." msg: "Set the value of 'docker_registry_repository' in the inventory file."
- name: docker_registry_username should be defined - name: docker_registry_username should be defined
assert: assert:
that: that:
- docker_registry_username is defined and docker_registry_username != '' - docker_registry_username is defined and docker_registry_username != ''
msg: "Set the value of 'docker_registry_username' in the inventory file." msg: "Set the value of 'docker_registry_username' in the inventory file."
- name: docker_registry_password should be defined - name: docker_registry_password should be defined
assert: assert:
that: that:
- docker_registry_password is defined and docker_registry_password != '' - docker_registry_password is defined and docker_registry_password != ''

View File

@@ -1,9 +1,7 @@
# main.yml # main.yml
--- ---
- include: check_openshift.yml
- include: check_openshift.yml
when: openshift_host is defined and openshift_host != '' when: openshift_host is defined and openshift_host != ''
- include: check_docker.yml - include: check_docker.yml
when: openshift_host is not defined or openshift_host == '' when: openshift_host is not defined or openshift_host == ''

View File

@@ -28,7 +28,6 @@ http {
#tcp_nopush on; #tcp_nopush on;
#gzip on; #gzip on;
upstream uwsgi { upstream uwsgi {
server localhost:8050; server localhost:8050;
} }

View File

@@ -1,5 +1,4 @@
--- ---
- name: Get Version from checkout if not provided - name: Get Version from checkout if not provided
shell: "git describe --long | sed 's/\\-g.*//' | sed 's/\\-/\\./'" shell: "git describe --long | sed 's/\\-g.*//' | sed 's/\\-/\\./'"
delegate_to: localhost delegate_to: localhost
@@ -157,7 +156,7 @@
tag: "{{ awx_version }}" tag: "{{ awx_version }}"
pull: no pull: no
delegate_to: localhost delegate_to: localhost
- name: Clean docker base directory - name: Clean docker base directory
file: file:
path: "{{ docker_base_path }}" path: "{{ docker_base_path }}"

View File

@@ -26,7 +26,7 @@ host_port=80
# docker_registry_repository=awx # docker_registry_repository=awx
# docker_registry_username=developer # docker_registry_username=developer
# Set pg_hostname if you have an external postgres server, otherwise # Set pg_hostname if you have an external postgres server, otherwise
# a new ephemeral postgres service will be created # a new ephemeral postgres service will be created
# pg_hostname=postgresql # pg_hostname=postgresql
pg_username=awx pg_username=awx

View File

@@ -9,7 +9,7 @@ data:
import os import os
import socket import socket
ADMINS = () ADMINS = ()
# Container environments don't like chroots # Container environments don't like chroots
AWX_PROOT_ENABLED = False AWX_PROOT_ENABLED = False
@@ -35,13 +35,13 @@ data:
EMAIL_HOST_USER = '' EMAIL_HOST_USER = ''
EMAIL_HOST_PASSWORD = '' EMAIL_HOST_PASSWORD = ''
EMAIL_USE_TLS = False EMAIL_USE_TLS = False
LOGGING['handlers']['console'] = { LOGGING['handlers']['console'] = {
'()': 'logging.StreamHandler', '()': 'logging.StreamHandler',
'level': 'DEBUG', 'level': 'DEBUG',
'formatter': 'simple', 'formatter': 'simple',
} }
LOGGING['loggers']['django.request']['handlers'] = ['console'] LOGGING['loggers']['django.request']['handlers'] = ['console']
LOGGING['loggers']['rest_framework.request']['handlers'] = ['console'] LOGGING['loggers']['rest_framework.request']['handlers'] = ['console']
LOGGING['loggers']['awx']['handlers'] = ['console'] LOGGING['loggers']['awx']['handlers'] = ['console']