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#\"}"