mirror of
https://github.com/ansible/awx.git
synced 2026-03-09 05:29:26 -02:30
Merge pull request #13200 from shanemcd/disable-work-signing
Disable work signing by default in dev env
This commit is contained in:
@@ -7,7 +7,7 @@ receptor_work_commands:
|
|||||||
command: ansible-runner
|
command: ansible-runner
|
||||||
params: worker
|
params: worker
|
||||||
allowruntimeparams: true
|
allowruntimeparams: true
|
||||||
verifysignature: true
|
verifysignature: {{ sign_work }}
|
||||||
custom_worksign_public_keyfile: receptor/work-public-key.pem
|
custom_worksign_public_keyfile: receptor/work-public-key.pem
|
||||||
custom_tls_certfile: receptor/tls/receptor.crt
|
custom_tls_certfile: receptor/tls/receptor.crt
|
||||||
custom_tls_keyfile: receptor/tls/receptor.key
|
custom_tls_keyfile: receptor/tls/receptor.key
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ receptor_image: quay.io/ansible/receptor:devel
|
|||||||
# Keys for signing work
|
# Keys for signing work
|
||||||
receptor_rsa_bits: 4096
|
receptor_rsa_bits: 4096
|
||||||
receptor_work_sign_reconfigure: false
|
receptor_work_sign_reconfigure: false
|
||||||
|
sign_work: no # currently defaults to no because openssl version mismatch causes "unknown block type PRIVATE KEY"
|
||||||
work_sign_key_dir: '../_sources/receptor'
|
work_sign_key_dir: '../_sources/receptor'
|
||||||
work_sign_private_keyfile: "{{ work_sign_key_dir }}/work_private_key.pem"
|
work_sign_private_keyfile: "{{ work_sign_key_dir }}/work_private_key.pem"
|
||||||
work_sign_public_keyfile: "{{ work_sign_key_dir }}/work_public_key.pem"
|
work_sign_public_keyfile: "{{ work_sign_key_dir }}/work_public_key.pem"
|
||||||
|
|||||||
@@ -86,11 +86,13 @@
|
|||||||
command: openssl genrsa -out {{ work_sign_private_keyfile }} {{ receptor_rsa_bits }}
|
command: openssl genrsa -out {{ work_sign_private_keyfile }} {{ receptor_rsa_bits }}
|
||||||
args:
|
args:
|
||||||
creates: "{{ work_sign_private_keyfile }}"
|
creates: "{{ work_sign_private_keyfile }}"
|
||||||
|
when: sign_work | bool
|
||||||
|
|
||||||
- name: Generate public RSA key for signing work
|
- name: Generate public RSA key for signing work
|
||||||
command: openssl rsa -in {{ work_sign_private_keyfile }} -out {{ work_sign_public_keyfile }} -outform PEM -pubout
|
command: openssl rsa -in {{ work_sign_private_keyfile }} -out {{ work_sign_public_keyfile }} -outform PEM -pubout
|
||||||
args:
|
args:
|
||||||
creates: "{{ work_sign_public_keyfile }}"
|
creates: "{{ work_sign_public_keyfile }}"
|
||||||
|
when: sign_work | bool
|
||||||
|
|
||||||
- name: Include LDAP tasks if enabled
|
- name: Include LDAP tasks if enabled
|
||||||
include_tasks: ldap.yml
|
include_tasks: ldap.yml
|
||||||
|
|||||||
@@ -43,8 +43,10 @@ services:
|
|||||||
- "../../docker-compose/_sources/SECRET_KEY:/etc/tower/SECRET_KEY"
|
- "../../docker-compose/_sources/SECRET_KEY:/etc/tower/SECRET_KEY"
|
||||||
- "../../docker-compose/_sources/receptor/receptor-awx-{{ loop.index }}.conf:/etc/receptor/receptor.conf"
|
- "../../docker-compose/_sources/receptor/receptor-awx-{{ loop.index }}.conf:/etc/receptor/receptor.conf"
|
||||||
- "../../docker-compose/_sources/receptor/receptor-awx-{{ loop.index }}.conf.lock:/etc/receptor/receptor.conf.lock"
|
- "../../docker-compose/_sources/receptor/receptor-awx-{{ loop.index }}.conf.lock:/etc/receptor/receptor.conf.lock"
|
||||||
|
{% if sign_work|bool %}
|
||||||
- "../../docker-compose/_sources/receptor/work_public_key.pem:/etc/receptor/work_public_key.pem"
|
- "../../docker-compose/_sources/receptor/work_public_key.pem:/etc/receptor/work_public_key.pem"
|
||||||
- "../../docker-compose/_sources/receptor/work_private_key.pem:/etc/receptor/work_private_key.pem"
|
- "../../docker-compose/_sources/receptor/work_private_key.pem:/etc/receptor/work_private_key.pem"
|
||||||
|
{% endif %}
|
||||||
# - "../../docker-compose/_sources/certs:/etc/receptor/certs" # TODO: optionally generate certs
|
# - "../../docker-compose/_sources/certs:/etc/receptor/certs" # TODO: optionally generate certs
|
||||||
- "/sys/fs/cgroup:/sys/fs/cgroup"
|
- "/sys/fs/cgroup:/sys/fs/cgroup"
|
||||||
- "~/.kube/config:/var/lib/awx/.kube/config"
|
- "~/.kube/config:/var/lib/awx/.kube/config"
|
||||||
|
|||||||
@@ -11,12 +11,16 @@
|
|||||||
- tcp-listener:
|
- tcp-listener:
|
||||||
port: 2222
|
port: 2222
|
||||||
|
|
||||||
|
{% if sign_work|bool %}
|
||||||
- work-signing:
|
- work-signing:
|
||||||
privatekey: /etc/receptor/work_private_key.pem
|
privatekey: /etc/receptor/work_private_key.pem
|
||||||
tokenexpiration: 1m
|
tokenexpiration: 1m
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if sign_work|bool %}
|
||||||
- work-verification:
|
- work-verification:
|
||||||
publickey: /etc/receptor/work_public_key.pem
|
publickey: /etc/receptor/work_public_key.pem
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{% for i in range(item | int + 1, control_plane_node_count | int + 1) %}
|
{% for i in range(item | int + 1, control_plane_node_count | int + 1) %}
|
||||||
- tcp-peer:
|
- tcp-peer:
|
||||||
@@ -40,7 +44,7 @@
|
|||||||
command: ansible-runner
|
command: ansible-runner
|
||||||
params: worker
|
params: worker
|
||||||
allowruntimeparams: true
|
allowruntimeparams: true
|
||||||
verifysignature: true
|
verifysignature: {{ sign_work }}
|
||||||
|
|
||||||
- work-kubernetes:
|
- work-kubernetes:
|
||||||
worktype: kubernetes-runtime-auth
|
worktype: kubernetes-runtime-auth
|
||||||
@@ -48,7 +52,7 @@
|
|||||||
allowruntimeauth: true
|
allowruntimeauth: true
|
||||||
allowruntimepod: true
|
allowruntimepod: true
|
||||||
allowruntimeparams: true
|
allowruntimeparams: true
|
||||||
verifysignature: true
|
verifysignature: {{ sign_work }}
|
||||||
|
|
||||||
- work-kubernetes:
|
- work-kubernetes:
|
||||||
worktype: kubernetes-incluster-auth
|
worktype: kubernetes-incluster-auth
|
||||||
@@ -56,4 +60,4 @@
|
|||||||
allowruntimeauth: true
|
allowruntimeauth: true
|
||||||
allowruntimepod: true
|
allowruntimepod: true
|
||||||
allowruntimeparams: true
|
allowruntimeparams: true
|
||||||
verifysignature: true
|
verifysignature: {{ sign_work }}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
command: ansible-runner
|
command: ansible-runner
|
||||||
params: worker
|
params: worker
|
||||||
allowruntimeparams: true
|
allowruntimeparams: true
|
||||||
verifysignature: true
|
verifysignature: {{ sign_work }}
|
||||||
|
|
||||||
- control-service:
|
- control-service:
|
||||||
service: control
|
service: control
|
||||||
|
|||||||
Reference in New Issue
Block a user