diff options
| author | likui <likui@yovole.com> | 2020-11-18 19:41:23 +0800 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-11-20 08:40:36 +0000 |
| commit | a62cce67e65315c0501c60528c0a0e0c63a88059 (patch) | |
| tree | 97553cf8c382b6246b135e1d3f1d694a343eb1fa /contrib | |
| parent | 4b3ef3f4ca577e6f6af82f59ee5f832f09ed8bce (diff) | |
| download | kolla-ansible-a62cce67e65315c0501c60528c0a0e0c63a88059.tar.gz kolla-ansible-a62cce67e65315c0501c60528c0a0e0c63a88059.zip | |
Update docs for Ubuntu 20.04
* Use 'apt install' command instead of legacy 'apt-get'
Change-Id: Idae8d325bce354fa3b4c5be412965122af8f1413
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/dev/vagrant/bootstrap.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/contrib/dev/vagrant/bootstrap.sh b/contrib/dev/vagrant/bootstrap.sh index d7260a323..d07221738 100644 --- a/contrib/dev/vagrant/bootstrap.sh +++ b/contrib/dev/vagrant/bootstrap.sh @@ -35,8 +35,8 @@ function _ensure_lsb_release { return fi - if type apt-get >/dev/null 2>&1; then - apt-get -y install lsb-release + if type apt >/dev/null 2>&1; then + apt -y install lsb-release elif type yum >/dev/null 2>&1; then yum -y install redhat-lsb-core fi @@ -79,8 +79,8 @@ function prep_work { systemctl stop ufw systemctl disable ufw fi - apt-get update - apt-get -y install python-mysqldb python-pip python-dev build-essential libssl-dev libffi-dev libxml2-dev libxslt-dev + apt update + apt -y install python-mysqldb python-pip python-dev build-essential libssl-dev libffi-dev libxml2-dev libxslt-dev else echo "Unsupported Distro: $DISTRO" 1>&2 exit 1 @@ -94,7 +94,7 @@ function cleanup { if is_centos; then yum clean all elif is_ubuntu; then - apt-get clean + apt clean else echo "Unsupported Distro: $DISTRO" 1>&2 exit 1 @@ -126,8 +126,8 @@ EOF elif is_ubuntu; then apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" > /etc/apt/sources.list.d/docker.list - apt-get update - apt-get -y install docker-engine + apt update + apt -y install docker-engine sed -i -r "s|(ExecStart)=(.+)|\1=/usr/bin/docker daemon --insecure-registry ${REGISTRY} --registry-mirror=http://${REGISTRY}|" /lib/systemd/system/docker.service else echo "Unsupported Distro: $DISTRO" 1>&2 @@ -217,7 +217,7 @@ function configure_operator { if is_centos; then yum -y install git mariadb elif is_ubuntu; then - apt-get -y install git mariadb-client selinux-utils + apt -y install git mariadb-client selinux-utils else echo "Unsupported Distro: $DISTRO" 1>&2 exit 1 |