Skip to content
This repository has been archived by the owner on Feb 29, 2024. It is now read-only.

Commit

Permalink
Don't assume json network config in validations
Browse files Browse the repository at this point in the history
Change I5f5cec5a1622be4983b4d0db392453d1c489fa40 allowed the
net_config_override file to be yaml as well as json, but if
enable_validations is true the _validate_no_ip_change assumes the
network config is json.

This change loads this file as yaml in _validate_no_ip_change.

Change-Id: Iaeadf412865c059d252ffc7087db3853569b74ee
Related-Bug: #1927090
(cherry picked from commit f8ee246)
  • Loading branch information
steveb committed Jan 4, 2022
1 parent a6fcdbf commit bd45a74
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tripleoclient/v1/undercloud_preflight.py
Expand Up @@ -12,13 +12,13 @@
# License for the specific language governing permissions and limitations
# under the License.

import json
import logging
import netaddr
import netifaces
import os
import subprocess
import sys
import yaml

from osc_lib.i18n import _

Expand Down Expand Up @@ -303,8 +303,8 @@ def _validate_no_ip_change():
os.path.expanduser(os_net_config_file)):
return
try:
with open(os_net_config_file) as f:
network_config = json.loads(f.read())
with open(os_net_config_file, 'r') as f:
network_config = yaml.safe_load(f)
ctlplane = [i for i in network_config.get('network_config', [])
if i['name'] == 'br-ctlplane'][0]
except ValueError:
Expand Down

0 comments on commit bd45a74

Please sign in to comment.