summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/deploy.sh10
-rw-r--r--docs/release/installation/installation.instruction.rst7
-rw-r--r--mcp/scripts/lib.sh4
3 files changed, 11 insertions, 10 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 5c663438c..0bb9caa50 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -265,15 +265,9 @@ pushd "${DEPLOY_DIR}" > /dev/null
# Install required packages
[ -n "$(command -v apt-get)" ] && sudo apt-get install -y \
- git make rsync mkisofs curl virtinst cpu-checker qemu-kvm
+ git make rsync mkisofs curl virtinst cpu-checker qemu-kvm uuid-runtime
[ -n "$(command -v yum)" ] && sudo yum install -y --skip-broken \
- git make rsync genisoimage curl virt-install qemu-kvm
-
-if [ "$(uname -i)" = "aarch64" ]; then
- [ -n "$(command -v apt-get)" ] && sudo apt-get install -y vgabios && \
- sudo ln -sf /usr/share/vgabios/vgabios.bin /usr/share/qemu/vgabios-stdvga.bin
- [ -n "$(command -v yum)" ] && sudo yum install -y --skip-broken vgabios
-fi
+ git make rsync genisoimage curl virt-install qemu-kvm util-linux
# Clone git submodules and apply our patches
make -C "${REPO_ROOT_PATH}/mcp/patches" deepclean patches-import
diff --git a/docs/release/installation/installation.instruction.rst b/docs/release/installation/installation.instruction.rst
index e475e487f..9b2c2e8c2 100644
--- a/docs/release/installation/installation.instruction.rst
+++ b/docs/release/installation/installation.instruction.rst
@@ -265,6 +265,10 @@ Examples
--------
#. Virtual deploy
+To start a virtual deployment, it is required to have the `virtual` keyword while specifying the pod name
+to the installer script. It will create the required bridges and networks, configure Salt Master and install
+OpenStack.
+
.. code-block:: bash
$ ci/deploy.sh -b file:///home/jenkins/tmpdir/securedlab \
@@ -272,6 +276,9 @@ Examples
-p virtual_kvm \
-s os-nosdn-nofeature-noha
+Once the deployment is complete, OpenStack Dashboard, Horizon is available at http://10.16.0.101:8078
+The administrator credentials are **admin** / **opnfv_secret**.
+
#. Baremetal deploy
A x86 deploy on pod1 from Ericsson lab
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index 8bdb5dd57..b4d45ddd6 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -95,8 +95,8 @@ function create_vms {
# AArch64: prepare arch specific arguments
local virt_extra_args=""
if [ "$(uname -i)" = "aarch64" ]; then
- # No Cirrus VGA on AArch64, use vga std
- virt_extra_args="$virt_extra_args --video=vga"
+ # No Cirrus VGA on AArch64, use virtio instead
+ virt_extra_args="$virt_extra_args --video=virtio"
fi
# create vms with specified options