From 0f344494edaa104e68c03d1b4b09f3035cc43002 Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Fri, 15 Jun 2018 09:53:26 +0200 Subject: [PATCH] Run dispatch script for all unmanaged devices Instead of parsing os-net-config, we should be running this script for all the unmanaged devices. The 99-origin-dns.sh script doesn't care whether the device is managed by NM or not, what it cares about is whether the device is the one used for the default route. Change-Id: I2cc0bc8179c51222616706aceaa99112af4c3fd8 --- extraconfig/services/openshift-master.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/extraconfig/services/openshift-master.yaml b/extraconfig/services/openshift-master.yaml index 2832b11aa1..bbdf6670af 100644 --- a/extraconfig/services/openshift-master.yaml +++ b/extraconfig/services/openshift-master.yaml @@ -166,13 +166,9 @@ outputs: content: >- #!/bin/bash -x - DEVS=$(jq '.network_config[] | {name}.name' /etc/os-net-config/config.json) - # NOTE(flaper87): We should, eventually, set the name on the vlan objects - # inside the os-net-config config.json file and use that. + DEVS=$(nmcli device | grep unmanaged | awk '{print $1}') - VLANS=$(jq '.network_config[] | .members // [] | del( .[] | select( .type != "vlan" ) ) | .[].type + (.[].vlan_id|tostring)' /etc/os-net-config/config.json) - - for dev in $DEVS $VLANS; + for dev in $DEVS; do temp="${dev%\"}" temp="${temp#\"}"