From bf99bab6c05ae5777af82e55df3c35f8e72024ba Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 29 Sep 2020 16:26:45 -0400 Subject: [PATCH] add quotes and remove quotes --- salt/reactor/fleet.sls | 4 ++-- setup/so-functions | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/salt/reactor/fleet.sls b/salt/reactor/fleet.sls index 4e4e13791..16451fec0 100644 --- a/salt/reactor/fleet.sls +++ b/salt/reactor/fleet.sls @@ -37,12 +37,12 @@ def run(): # Update the Fleet host in the static pillar for line in fileinput.input(STATICFILE, inplace=True): - line = re.sub(r'fleet_hostname: \S*', f"fleet_hostname: {HOSTNAME}", line.rstrip()) + line = re.sub(r'fleet_hostname: \S*', f"fleet_hostname: '{HOSTNAME}'", line.rstrip()) print(line) # Update the Fleet IP in the static pillar for line in fileinput.input(STATICFILE, inplace=True): - line = re.sub(r'fleet_ip: \S*', f"fleet_ip: {MAINIP}", line.rstrip()) + line = re.sub(r'fleet_ip: \S*', f"fleet_ip: '{MAINIP}'", line.rstrip()) print(line) if ACTION == 'genpackages': diff --git a/setup/so-functions b/setup/so-functions index 21bc6077a..acd0f80cd 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1026,7 +1026,7 @@ host_pillar() { # Create the host pillar printf '%s\n'\ "host:"\ - " mainint: $MNIC"\ + " mainint: '$MNIC'"\ "" > "$pillar_file" } @@ -1065,7 +1065,7 @@ manager_pillar() { " mainip: '$MAINIP'"\ " mainint: '$MNIC'"\ " esheap: '$ES_HEAP_SIZE'"\ - " esclustername: '{{ grains.host }}'"\ + " esclustername: {{ grains.host }}"\ " freq: 0"\ " domainstats: 0" >> "$pillar_file" @@ -1088,8 +1088,8 @@ manager_pillar() { "elasticsearch:"\ " mainip: '$MAINIP'"\ " mainint: '$MNIC'"\ - " esheap: $NODE_ES_HEAP_SIZE"\ - " esclustername: '{{ grains.host }}'"\ + " esheap: '$NODE_ES_HEAP_SIZE'"\ + " esclustername: {{ grains.host }}"\ " node_type: '$NODETYPE'"\ " es_port: $node_es_port"\ " log_size_limit: $log_size_limit"\ @@ -1308,8 +1308,8 @@ elasticsearch_pillar() { "elasticsearch:"\ " mainip: '$MAINIP'"\ " mainint: '$MNIC'"\ - " esheap: $NODE_ES_HEAP_SIZE"\ - " esclustername: '{{ grains.host }}'"\ + " esheap: '$NODE_ES_HEAP_SIZE'"\ + " esclustername: {{ grains.host }}"\ " node_type: '$NODETYPE'"\ " es_port: $node_es_port"\ " log_size_limit: $log_size_limit"\