Commit bb064b6e authored by Thorstein Nordby's avatar Thorstein Nordby Committed by Thorstein Buind Nordby
Browse files

linting issues

parent fe941cdd
--- ---
# handlers file for ansible-role-awx-docker # handlers file for ansible-role-awx-docker
\ No newline at end of file - name: Make pem from self-signed
shell: cat {{ awx_web_ssl_key_folder }}/{{ inventory_hostname }}.key {{ awx_web_ssl_cert_folder }}/{{ inventory_hostname }}.crt > {{ awx_web_ssl_cert_folder }}/{{ inventory_hostname }}.pem # noqa 204
\ No newline at end of file
...@@ -13,12 +13,11 @@ ...@@ -13,12 +13,11 @@
loop: loop:
- path: "{{ awx_repo_dir }}/installer/roles/local_docker/defaults/main.yml" - path: "{{ awx_repo_dir }}/installer/roles/local_docker/defaults/main.yml"
regexp: '^rabbitmq_image' regexp: '^rabbitmq_image'
line: rabbitmq_image{{':'}} "{{ '{{awx_docker_registry}}' }}/ansible/awx_rabbitmq:{{ '{{rabbitmq_version}}' }}" line: rabbitmq_image{{':'}} "{{ '{{ awx_docker_registry }}' }}/ansible/awx_rabbitmq:{{ '{{ rabbitmq_version }}' }}"
- path: "{{ awx_repo_dir }}/installer/roles/local_docker/defaults/main.yml" - path: "{{ awx_repo_dir }}/installer/roles/local_docker/defaults/main.yml"
regexp: '^postgresql_image' regexp: '^postgresql_image'
line: postgresql_image{{':'}} "{{ '{{awx_docker_registry}}' }}/postgres:{{ '{{postgresql_version}}' }}" line: postgresql_image{{':'}} "{{ '{{ awx_docker_registry }}' }}/postgres:{{ '{{ postgresql_version }}' }}"
- path: "{{ awx_repo_dir }}/installer/roles/local_docker/defaults/main.yml" - path: "{{ awx_repo_dir }}/installer/roles/local_docker/defaults/main.yml"
regexp: '^memcached_image' regexp: '^memcached_image'
line: memcached_image{{':'}} "{{ '{{awx_docker_registry}}' }}/memcached" line: memcached_image{{':'}} "{{ '{{ awx_docker_registry }}' }}/memcached"
... ...
\ No newline at end of file
--- ---
- name: Make cert folder - name: Make cert folder
file: file:
path: "{{awx_web_ssl_cert_folder}}" path: "{{ awx_web_ssl_cert_folder }}"
state: directory state: directory
- name: Make cert Key folder - name: Make cert Key folder
file: file:
path: "{{awx_web_ssl_key_folder}}" path: "{{ awx_web_ssl_key_folder }}"
state: directory state: directory
#Work in progress, need to handle different cert extentions #Work in progress, need to handle different cert extentions
......
--- ---
- name: Make cert folder - name: Make cert folder
file: file:
path: "{{awx_web_ssl_cert_folder}}" path: "{{ awx_web_ssl_cert_folder }}"
state: directory state: directory
- name: Make cert Key folder - name: Make cert Key folder
file: file:
path: "{{awx_web_ssl_key_folder}}" path: "{{ awx_web_ssl_key_folder }}"
state: directory state: directory
- name: Make CSR folder - name: Make CSR folder
file: file:
path: "{{awx_web_ssl_cert_folder}}/csr" path: "{{ awx_web_ssl_cert_folder }}/csr"
state: directory state: directory
- name: Make cert private Key - name: Make cert private Key
openssl_privatekey: openssl_privatekey:
path: "{{awx_web_ssl_key_folder}}/{{inventory_hostname}}.key" path: "{{ awx_web_ssl_key_folder }}/{{ inventory_hostname }}.key"
- name: Make cert CSR - name: Make cert CSR
openssl_csr: openssl_csr:
path: "{{awx_web_ssl_cert_folder}}/csr/{{inventory_hostname}}.csr" path: "{{ awx_web_ssl_cert_folder }}/csr/{{ inventory_hostname }}.csr"
privatekey_path: "{{awx_web_ssl_key_folder}}/{{inventory_hostname}}.key" privatekey_path: "{{ awx_web_ssl_key_folder }}/{{ inventory_hostname }}.key"
common_name: "{{inventory_hostname}}" common_name: "{{ inventory_hostname }}"
- name: Make self signet cert - name: Make self signet cert
openssl_certificate: openssl_certificate:
path: "{{ awx_web_ssl_cert_folder }}/{{ inventory_hostname }}.crt" path: "{{ awx_web_ssl_cert_folder }}/{{ inventory_hostname }}.crt"
privatekey_path: "{{awx_web_ssl_key_folder}}/{{inventory_hostname}}.key" privatekey_path: "{{ awx_web_ssl_key_folder }}/{{ inventory_hostname }}.key"
csr_path: "{{awx_web_ssl_cert_folder}}/csr/{{ inventory_hostname}}.csr" csr_path: "{{ awx_web_ssl_cert_folder }}/csr/{{ inventory_hostname }}.csr"
selfsigned_not_after: "+3650d" selfsigned_not_after: "+3650d"
provider: selfsigned provider: selfsigned
notify: Make pem from self-signed
- name: Make pem cert
shell: cat {{awx_web_ssl_key_folder}}/{{inventory_hostname}}.key {{ awx_web_ssl_cert_folder }}/{{ inventory_hostname }}.crt > {{ awx_web_ssl_cert_folder }}/{{ inventory_hostname }}.pem
- name: Add cert to awx inventory file - name: Add cert to awx inventory file
lineinfile: lineinfile:
......
--- ---
- name: Set default passwords - name: Set default passwords
lineinfile: lineinfile:
path: "{{ awx_repo_dir }}/installer/inventory" path: "{{ awx_repo_dir }}/installer/inventory"
state: "{{ item.state | default('present') }}" state: "{{ item.state | default('present') }}"
regexp: "{{ item.regexp }}" regexp: "{{ item.regexp }}"
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
- name: Setup self-signed certs - name: Setup self-signed certs
include: awx-self-signed-cert.yml include: awx-self-signed-cert.yml
when: when:
- awx_web_ssl - awx_web_ssl
- awx_web_ssl_selfsigned - awx_web_ssl_selfsigned
- name: Setup certs - name: Setup certs
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment