openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Flavio Percoco 2018-06-15 09:53:26 +02:00
parent cc046a757c
commit 0f344494ed
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extraconfig/services/openshift-master.yaml
View File

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