diff --git a/awx/api/templates/instance_install_bundle/group_vars/all.yml b/awx/api/templates/instance_install_bundle/group_vars/all.yml index c23ed2d016..a03dc65543 100644 --- a/awx/api/templates/instance_install_bundle/group_vars/all.yml +++ b/awx/api/templates/instance_install_bundle/group_vars/all.yml @@ -9,7 +9,7 @@ receptor_work_commands: params: worker allowruntimeparams: true verifysignature: true -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_keyfile: receptor/tls/receptor.key custom_ca_certfile: receptor/tls/ca/receptor-ca.crt diff --git a/awx/api/views/instance_install_bundle.py b/awx/api/views/instance_install_bundle.py index 3f65abfc6d..8cd3c31e3b 100644 --- a/awx/api/views/instance_install_bundle.py +++ b/awx/api/views/instance_install_bundle.py @@ -57,13 +57,11 @@ class InstanceInstallBundle(GenericAPIView): with io.BytesIO() as f: with tarfile.open(fileobj=f, mode='w:gz') as tar: - # copy /etc/receptor/tls/ca/receptor-ca.crt to receptor/tls/ca in the tar file - tar.add( - os.path.realpath('/etc/receptor/tls/ca/receptor-ca.crt'), arcname=f"{instance_obj.hostname}_install_bundle/receptor/tls/ca/receptor-ca.crt" - ) + # copy /etc/receptor/tls/ca/mesh-CA.crt to receptor/tls/ca in the tar file + tar.add(os.path.realpath('/etc/receptor/tls/ca/mesh-CA.crt'), arcname=f"{instance_obj.hostname}_install_bundle/receptor/tls/ca/mesh-CA.crt") - # copy /etc/receptor/signing/work-public-key.pem to receptor/work-public-key.pem - tar.add('/etc/receptor/signing/work-public-key.pem', arcname=f"{instance_obj.hostname}_install_bundle/receptor/work-public-key.pem") + # copy /etc/receptor/work_public_key.pem to receptor/work_public_key.pem + tar.add('/etc/receptor/work_public_key.pem', arcname=f"{instance_obj.hostname}_install_bundle/receptor/work_public_key.pem") # generate and write the receptor key to receptor/tls/receptor.key in the tar file key, cert = generate_receptor_tls(instance_obj) @@ -161,14 +159,14 @@ def generate_receptor_tls(instance_obj): .sign(key, hashes.SHA256()) ) - # sign csr with the receptor ca key from /etc/receptor/ca/receptor-ca.key - with open('/etc/receptor/tls/ca/receptor-ca.key', 'rb') as f: + # sign csr with the receptor ca key from /etc/receptor/ca/mesh-CA.key + with open('/etc/receptor/tls/ca/mesh-CA.key', 'rb') as f: ca_key = serialization.load_pem_private_key( f.read(), password=None, ) - with open('/etc/receptor/tls/ca/receptor-ca.crt', 'rb') as f: + with open('/etc/receptor/tls/ca/mesh-CA.crt', 'rb') as f: ca_cert = x509.load_pem_x509_certificate(f.read()) cert = ( diff --git a/awx/main/tasks/receptor.py b/awx/main/tasks/receptor.py index d9127dfb44..24108a9c57 100644 --- a/awx/main/tasks/receptor.py +++ b/awx/main/tasks/receptor.py @@ -665,7 +665,7 @@ RECEPTOR_CONFIG_STARTER = ( { 'tls-client': { 'name': 'tlsclient', - 'rootcas': '/etc/receptor/tls/ca/receptor-ca.crt', + 'rootcas': '/etc/receptor/tls/ca/mesh-CA.crt', 'cert': '/etc/receptor/tls/receptor.crt', 'key': '/etc/receptor/tls/receptor.key', 'mintls13': False,