diff options
| -rw-r--r-- | deploy/adapters/cobbler/snippets/preseed_post_install_network_config | 2 | ||||
| -rwxr-xr-x | deploy/compass_vm.sh | 5 | ||||
| -rwxr-xr-x | deploy/launch.sh | 2 | ||||
| -rwxr-xr-x | deploy/network.sh | 2 | ||||
| -rwxr-xr-x | deploy/prepare.sh | 3 | ||||
| -rw-r--r-- | deploy/rename_nics.py | 14 |
6 files changed, 16 insertions, 12 deletions
diff --git a/deploy/adapters/cobbler/snippets/preseed_post_install_network_config b/deploy/adapters/cobbler/snippets/preseed_post_install_network_config index 42df3cb6..cb79c556 100644 --- a/deploy/adapters/cobbler/snippets/preseed_post_install_network_config +++ b/deploy/adapters/cobbler/snippets/preseed_post_install_network_config @@ -441,7 +441,7 @@ echo "" >> /etc/network/interfaces used_logical_interface_$iname=$iname - #if $iface_type in ("slave","bond_slave","bridge_slave","bonded_bridge_slave","static") + #if $iface_type in ("slave","bond_slave","bridge_slave","bonded_bridge_slave") #set $static = 1 #end if echo "auto $iname" >> /etc/network/interfaces diff --git a/deploy/compass_vm.sh b/deploy/compass_vm.sh index f1c92892..61e27051 100755 --- a/deploy/compass_vm.sh +++ b/deploy/compass_vm.sh @@ -74,6 +74,11 @@ function inject_compass_conf() { _inject_dashboard_conf } +function refresh_compass_core () { + cmd="/opt/compass/bin/refresh.sh" + exec_cmd_on_compass $cmd +} + function wait_ok() { set +x log_info "wait_compass_ok enter" diff --git a/deploy/launch.sh b/deploy/launch.sh index 4e6e1a39..9031cb62 100755 --- a/deploy/launch.sh +++ b/deploy/launch.sh @@ -71,6 +71,8 @@ if [[ "$EXPANSION" == "false" ]]; then log_error "launch_compass failed" exit 1 fi + else + refresh_compass_core fi else machines=`get_host_macs` diff --git a/deploy/network.sh b/deploy/network.sh index 6c678222..97d71880 100755 --- a/deploy/network.sh +++ b/deploy/network.sh @@ -17,6 +17,8 @@ function setup_bridge_net() net_name=$1 nic=$2 + sudo ifconfig $nic up + sudo virsh net-destroy $net_name sudo virsh net-undefine $net_name diff --git a/deploy/prepare.sh b/deploy/prepare.sh index 97771b87..06852a42 100755 --- a/deploy/prepare.sh +++ b/deploy/prepare.sh @@ -31,7 +31,8 @@ function download_iso() } function prepare_env() { - + sed -i -e 's/^#user =.*/user = "root"/g' /etc/libvirt/qemu.conf + sed -i -e 's/^#group =.*/group = "root"/g' /etc/libvirt/qemu.conf sudo service libvirt-bin restart if sudo service openvswitch-switch status|grep stop; then sudo service openvswitch-switch start diff --git a/deploy/rename_nics.py b/deploy/rename_nics.py index a460e809..21651f68 100644 --- a/deploy/rename_nics.py +++ b/deploy/rename_nics.py @@ -17,16 +17,10 @@ def rename_nics(dha_info, rsa_file, compass_ip, os_version): nic_name = interface.keys()[0] mac = interface.values()[0] - if os_version == 'xenial': - exec_cmd("ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \ - -i %s root@%s \ - 'cobbler system edit --name=%s --interface=%s --mac=%s --interface_type=static'" # noqa - % (rsa_file, compass_ip, host_name, nic_name, mac)) # noqa - else: - exec_cmd("ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \ - -i %s root@%s \ - 'cobbler system edit --name=%s --interface=%s --mac=%s'" # noqa - % (rsa_file, compass_ip, host_name, nic_name, mac)) # noqa + exec_cmd("ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \ + -i %s root@%s \ + 'cobbler system edit --name=%s --interface=%s --mac=%s --static=1'" # noqa + % (rsa_file, compass_ip, host_name, nic_name, mac)) # noqa exec_cmd("ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \ -i %s root@%s \ |