openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Run dispatch script for all unmanaged devices"

This commit is contained in:
Zuul 2018-06-20 03:57:10 +00:00 committed by Gerrit Code Review
parent c3495cdfdf 0f344494ed
commit a83a792eb5
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#\"}"