X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fmetal3-vm%2F02_configure_host.sh;h=c31652210e9b27ca066259110bbd9d4ef3158634;hb=e3be88235a3456ea1b7fd34460d21d894ba21871;hp=634d4ee1f96b99dcc4066df72e432d168e02a1f6;hpb=261e40f7e1d37c37f79e27cab064202b240c14e9;p=icn.git diff --git a/deploy/metal3-vm/02_configure_host.sh b/deploy/metal3-vm/02_configure_host.sh index 634d4ee..c316522 100755 --- a/deploy/metal3-vm/02_configure_host.sh +++ b/deploy/metal3-vm/02_configure_host.sh @@ -63,14 +63,14 @@ else if [ ! -e /etc/sysconfig/network-scripts/ifcfg-provisioning ] ; then echo -e "DEVICE=provisioning\nTYPE=Bridge\nONBOOT=yes\nNM_CONTROLLED=no\nBOOTPROTO=static\nIPADDR=172.22.0.1\nNETMASK=255.255.255.0" | sudo dd of=/etc/sysconfig/network-scripts/ifcfg-provisioning fi - sudo ifdown provisioning || true - sudo ifup provisioning + sudo ip link set dev provisioning down || true + sudo ip link set dev provisioning up # Need to pass the provision interface for bare metal if [ "$PRO_IF" ]; then echo -e "DEVICE=$PRO_IF\nTYPE=Ethernet\nONBOOT=yes\nNM_CONTROLLED=no\nBRIDGE=provisioning" | sudo dd of="/etc/sysconfig/network-scripts/ifcfg-$PRO_IF" - sudo ifdown "$PRO_IF" || true - sudo ifup "$PRO_IF" + sudo ip link set dev "$PRO_IF" down || true + sudo ip link set dev "$PRO_IF" up fi fi @@ -79,8 +79,8 @@ else if [ ! -e /etc/sysconfig/network-scripts/ifcfg-baremetal ] ; then echo -e "DEVICE=baremetal\nTYPE=Bridge\nONBOOT=yes\nNM_CONTROLLED=no" | sudo dd of=/etc/sysconfig/network-scripts/ifcfg-baremetal fi - sudo ifdown baremetal || true - sudo ifup baremetal + sudo ip link set dev baremetal down || true + sudo ip link set dev baremetal up # Add the internal interface to it if requests, this may also be the interface providing # external access so we need to make sure we maintain dhcp config if its available @@ -100,7 +100,7 @@ else sudo virsh net-destroy baremetal sudo virsh net-start baremetal if [ "$INT_IF" ]; then #Need to bring UP the NIC after destroying the libvirt network - sudo ifup "$INT_IF" + sudo ip link set dev "$INT_IF" up fi fi fi @@ -169,18 +169,6 @@ done # set password for mariadb mariadb_password="$(echo "$(date;hostname)"|sha256sum |cut -c-20)" -if [[ "${CONTAINER_RUNTIME}" == "podman" ]]; then - # Remove existing pod - if sudo "${CONTAINER_RUNTIME}" pod exists ironic-pod ; then - sudo "${CONTAINER_RUNTIME}" pod rm ironic-pod -f - fi - # Create pod - sudo "${CONTAINER_RUNTIME}" pod create -n ironic-pod - POD_NAME="--pod ironic-pod" -else - POD_NAME="" -fi - cat < ${PWD}/ironic.env PROVISIONING_INTERFACE=provisioning DHCP_RANGE=172.22.0.10,172.22.0.100