openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Run the dispatch script for vlans as well"

Browse Source
This commit is contained in:
Zuul
2018-04-26 23:12:08 +00:00
committed by Gerrit Code Review
parent 98dfa06600 b7fe99e172
commit c2b6211f6c
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -179,7 +179,13 @@ outputs:
content: >- content: >-
#!/bin/bash -x #!/bin/bash -x
for dev in $(jq '.network_config[] | {name}.name' /etc/os-net-config/config.json); 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.
VLANS=$(jq '.network_config[] | .members // [] | del( .[] | select( .type != "vlan" ) ) | .[].type + (.[].vlan_id|tostring)' /etc/os-net-config/config.json)
for dev in $DEVS $VLANS;
do do
temp="${dev%\"}" temp="${dev%\"}"
temp="${temp#\"}" temp="${temp#\"}"