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

Remove extra newlines in install bundle all.yml

Browse Source
This commit is contained in:
Seth Foster
2023-08-01 11:46:09 -04:00
committed by Seth Foster
parent b9ea114cac
commit 532e71ff45
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/api/views/instance_install_bundle.py
View File

@@ -7,6 +7,7 @@ import ipaddress
import os import os
import tarfile import tarfile
import time import time
import re
import asn1 import asn1
from awx.api import serializers from awx.api import serializers
@@ -41,6 +42,8 @@ RECEPTOR_OID = "1.3.6.1.4.1.2312.19.1"
# │ │ └── receptor.key # │ │ └── receptor.key
# │ └── work-public-key.pem # │ └── work-public-key.pem
# └── requirements.yml # └── requirements.yml
class InstanceInstallBundle(GenericAPIView): class InstanceInstallBundle(GenericAPIView):
name = _('Install Bundle') name = _('Install Bundle')
model = models.Instance model = models.Instance
@@ -123,7 +126,9 @@ def generate_group_vars_all_yml(instance_obj):
for instance in instance_obj.peers.all(): for instance in instance_obj.peers.all():
host_or_ip = instance.ip_address or instance.hostname host_or_ip = instance.ip_address or instance.hostname
peers.append(dict(host=host_or_ip, port=instance.listener_port)) peers.append(dict(host=host_or_ip, port=instance.listener_port))
return render_to_string("instance_install_bundle/group_vars/all.yml", context=dict(instance=instance_obj, peers=peers)) all_yaml = render_to_string("instance_install_bundle/group_vars/all.yml", context=dict(instance=instance_obj, peers=peers))
# convert consecutive newlines with a single newline
return re.sub(r'\n+', '\n', all_yaml)
def generate_receptor_tls(instance_obj): def generate_receptor_tls(instance_obj):