diff options
| -rwxr-xr-x | ci/deploy/deploy.sh | 2 | ||||
| -rwxr-xr-x | deploy/get_conf.py | 28 |
2 files changed, 15 insertions, 15 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index f8250c26..e4a3851b 100755 --- a/ci/deploy/deploy.sh +++ b/ci/deploy/deploy.sh @@ -346,7 +346,7 @@ function get_mac_addresses_for_virtual() for ((i=0;i<${#VM_MULTINODE[@]};i++));do name=${VM_MULTINODE[$i]} macs=$(virsh dumpxml $name | grep "<mac" | awk -F "'" '{print $2}' | tr "\n" " ") - line=$(awk "BEGIN{}(/name/&&/controller01/){print NR}" $tmpfile) + line=$(awk "BEGIN{}(/name/&&/$name/){print NR}" $tmpfile) sed -i "${line}a\ mac_addresses:" $tmpfile for mac in $macs; do line=$[ line + 1 ] diff --git a/deploy/get_conf.py b/deploy/get_conf.py index 1f4500a4..4d112589 100755 --- a/deploy/get_conf.py +++ b/deploy/get_conf.py @@ -25,8 +25,8 @@ def init(file): def decorator_mk(types): def decorator(func): - def wrapter(s): - item_list = s.get(types, []) + def wrapter(data): + item_list = data.get(types, []) result = {} for item in item_list: ret = func(item) @@ -88,15 +88,15 @@ def mac_address(host=None): return map -def network_config_parse(s, dha_file): - network_map = network(s) - vip = s.get('internal_vip') - interface_map = interface(s) +def network_config_parse(network_data): + network_map = network(network_data) + vip = network_data.get('internal_vip') + interface_map = interface(network_data) return network_map, vip, interface_map -def dha_config_parse(s, dha_file): - host_role_map = role(s) +def dha_config_parse(dha_data): + host_role_map = role(dha_data) hosts_name = [] for name in host_role_map: hosts_name.append(name) @@ -104,12 +104,12 @@ def dha_config_parse(s, dha_file): def config(dha_file, network_file): - data = init(dha_file) - ceph_disk_name = data.get('ceph_disk_name') - hosts_name = dha_config_parse(data, dha_file) - mac_address_map = mac_address(data) - data = init(network_file) - network_map, vip, interface_map = network_config_parse(data, network_file) + dha_data = init(dha_file) + ceph_disk_name = dha_data.get('ceph_disk_name') + hosts_name = dha_config_parse(dha_data) + mac_address_map = mac_address(dha_data) + network_data = init(network_file) + network_map, vip, interface_map = network_config_parse(network_data) return interface_map, hosts_name, network_map, vip, ceph_disk_name, mac_address_map |