openstack
/
tripleo-image-elements
Code Issues Proposed changes

Merge "Use /etc/os-net-config/element_config.json"

This commit is contained in:
Jenkins 2017-07-05 19:44:20 +00:00 committed by Gerrit Code Review
parent 401d861950 45e8bde2e6
commit 0143ed82e8
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/os-net-config/README.md
View File

@ -1,7 +1,7 @@
Install, configure, and (optionally) run os-net-config.
Installs os-net-config and configures a JSON formatted config file
at /etc/os-net-config/config.json. The os-net-config command
at /etc/os-net-config/element\_config.json. The os-net-config command
is only executed if configuration metadata is provided.
Configuration

0
elements/os-net-config/os-apply-config/etc/os-net-config/config.json → elements/os-net-config/os-apply-config/etc/os-net-config/element_config.json
View File

2
elements/os-net-config/os-refresh-config/configure.d/20-os-net-config
View File

@ -100,7 +100,7 @@ NET_CONFIG=$(os-apply-config --key os_net_config --type raw --key-default '')
if [ -n "$NET_CONFIG" ]; then
trap configure_safe_defaults EXIT
os-net-config -c /etc/os-net-config/config.json -v --detailed-exit-codes
os-net-config -c /etc/os-net-config/element_config.json -v --detailed-exit-codes
RETVAL=$?
if [[ $RETVAL == 2 ]]; then
ping_metadata_ip