diff options
Diffstat (limited to 'boot/aaf_install.sh')
| -rw-r--r-- | boot/aaf_install.sh | 45 |
1 files changed, 2 insertions, 43 deletions
diff --git a/boot/aaf_install.sh b/boot/aaf_install.sh index c8531d55..171592ce 100644 --- a/boot/aaf_install.sh +++ b/boot/aaf_install.sh @@ -27,34 +27,6 @@ then cp /home/ubuntu/.ssh/authorized_keys /root/.ssh fi -# Set private IP in /etc/network/interfaces manually in the presence of public interface -# Some VM images don't add the private interface automatically, we have to do it during the component installation -if [[ $CLOUD_ENV == "openstack_nofloat" ]] -then - LOCAL_IP=$(cat /opt/config/local_ip_addr.txt) - CIDR=$(cat /opt/config/oam_network_cidr.txt) - BITMASK=$(echo $CIDR | cut -d"/" -f2) - - # Compute the netmask based on the network cidr - if [[ $BITMASK == "8" ]] - then - NETMASK=255.0.0.0 - elif [[ $BITMASK == "16" ]] - then - NETMASK=255.255.0.0 - elif [[ $BITMASK == "24" ]] - then - NETMASK=255.255.255.0 - fi - - echo "auto eth1" >> /etc/network/interfaces - echo "iface eth1 inet static" >> /etc/network/interfaces - echo " address $LOCAL_IP" >> /etc/network/interfaces - echo " netmask $NETMASK" >> /etc/network/interfaces - echo " mtu $MTU" >> /etc/network/interfaces - ifup eth1 -fi - # Download dependencies echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list @@ -63,11 +35,12 @@ apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates w # Download scripts from Nexus unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip aaf_vm_init.sh > /opt/aaf_vm_init.sh -unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip aaf_serv.sh > /opt/aaf_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/aaf_serv.sh unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh chmod +x /opt/imagetest.sh chmod +x /opt/aaf_vm_init.sh chmod +x /opt/aaf_serv.sh +sed -i "s|cmd=\"\"|cmd=\"./aaf_vm_init.sh\"|g" /opt/aaf_serv.sh mv /opt/aaf_serv.sh /etc/init.d update-rc.d aaf_serv.sh defaults @@ -115,8 +88,6 @@ chmod +x /opt/authz/auth/docker/dbuild.sh chmod +x /opt/authz/auth/docker/drun.sh chmod +x /opt/authz/auth/docker/dstart.sh chmod +x /opt/authz/auth/docker/dstop.sh -# d.props is not a startable shell -# chmod +x /opt/authz/auth/docker/d.props #Update maven settings cat > /usr/share/maven/conf/settings.xml << EOF @@ -527,17 +498,5 @@ EOF cd /opt/authz mvn install -Dmaven.test.skip=true -# Rename network interface in openstack Ubuntu 16.04 images. Then, reboot the VM to pick up changes -if [[ $CLOUD_ENV != "rackspace" ]] -then - sed -i "s/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub - grub-mkconfig -o /boot/grub/grub.cfg - sed -i "s/ens[0-9]*/eth0/g" /etc/network/interfaces.d/*.cfg - sed -i "s/ens[0-9]*/eth0/g" /etc/udev/rules.d/70-persistent-net.rules - echo 'network: {config: disabled}' >> /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg - echo "APT::Periodic::Unattended-Upgrade \"0\";" >> /etc/apt/apt.conf.d/10periodic - reboot -fi - cd /opt ./aaf_vm_init.sh |