From a62cce67e65315c0501c60528c0a0e0c63a88059 Mon Sep 17 00:00:00 2001
From: likui <likui@yovole.com>
Date: Wed, 18 Nov 2020 19:41:23 +0800
Subject: [PATCH] Update docs for Ubuntu 20.04
* Use 'apt install' command instead of legacy 'apt-get'
Change-Id: Idae8d325bce354fa3b4c5be412965122af8f1413
---
contrib/dev/vagrant/bootstrap.sh | 16 ++++++++--------
doc/source/contributor/vagrant-dev-env.rst | 2 +-
doc/source/user/quickstart.rst | 10 +++++-----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/contrib/dev/vagrant/bootstrap.sh b/contrib/dev/vagrant/bootstrap.sh
index d7260a3239..d07221738a 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
diff --git a/doc/source/contributor/vagrant-dev-env.rst b/doc/source/contributor/vagrant-dev-env.rst
index d0e0b208fa..7d231910eb 100644
--- a/doc/source/contributor/vagrant-dev-env.rst
+++ b/doc/source/contributor/vagrant-dev-env.rst
@@ -51,7 +51,7 @@ For Ubuntu 16.04 or later:
.. code-block:: console
- sudo apt-get install vagrant ruby-dev ruby-libvirt python-libvirt \
+ sudo apt install vagrant ruby-dev ruby-libvirt python-libvirt \
qemu-utils qemu-kvm libvirt-dev nfs-kernel-server zlib1g-dev libpng12-dev \
gcc git
diff --git a/doc/source/user/quickstart.rst b/doc/source/user/quickstart.rst
index 2524033a5a..f6f80c5f49 100644
--- a/doc/source/user/quickstart.rst
+++ b/doc/source/user/quickstart.rst
@@ -41,7 +41,7 @@ execution, which is described in
.. code-block:: console
- sudo apt-get update
+ sudo apt update
#. Install Python build dependencies:
@@ -55,7 +55,7 @@ execution, which is described in
.. code-block:: console
- sudo apt-get install python3-dev libffi-dev gcc libssl-dev
+ sudo apt install python3-dev libffi-dev gcc libssl-dev
Install dependencies using a virtual environment
------------------------------------------------
@@ -102,7 +102,7 @@ If installing Kolla Ansible in a virtual environment, skip this section.
.. code-block:: console
- sudo apt-get install python3-pip
+ sudo apt install python3-pip
#. Ensure the latest version of pip is installed:
@@ -123,7 +123,7 @@ If installing Kolla Ansible in a virtual environment, skip this section.
.. code-block:: console
- sudo apt-get install ansible
+ sudo apt install ansible
.. note::
@@ -314,7 +314,7 @@ than one node, edit ``multinode`` inventory:
Distributions might not come with Python pre-installed. That will cause
errors in the ``ping`` module. To quickly install Python with Ansible you
can run: for Debian or Ubuntu:
- ``ansible -i multinode all -m raw -a "apt-get -y install python3"``,
+ ``ansible -i multinode all -m raw -a "apt -y install python3"``,
and for CentOS or RHEL:
``ansible -i multinode all -m raw -a "dnf -y install python3"``.