summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuild.sh9
-rwxr-xr-xdeploy/network.sh3
-rw-r--r--docs/release/installation/k8s-deploy.rst2
-rw-r--r--docs/release/installation/vmdeploy.rst3
-rw-r--r--plugins/dpdk/roles/ins_dpdk/tasks/hugepages.yml2
-rw-r--r--plugins/rt_kvm/roles/rt_kvm/tasks/kvm.yml2
6 files changed, 16 insertions, 5 deletions
diff --git a/build.sh b/build.sh
index 4fd0d19b..103bbb8f 100755
--- a/build.sh
+++ b/build.sh
@@ -13,6 +13,8 @@ COMPASS_PATH=`cd ${BASH_SOURCE[0]%/*};pwd`
WORK_DIR=$COMPASS_PATH/work/building
export CACHE_DIR=$WORK_DIR/cache
+COMPASS_ARCH=$(uname -m)
+
echo $COMPASS_PATH
REDHAT_REL=${REDHAT_REL:-"false"}
@@ -23,12 +25,17 @@ mkdir -p $WORK_DIR $CACHE_DIR
function install_docker_ubuntu()
{
+ REPO_ARCH=amd64
+ if [ "$COMPASS_ARCH" = "aarch64" ]; then
+ REPO_ARCH=arm64
+ fi
+
sudo apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
sudo apt-get install -y apt-transport-https ca-certificates curl \
software-properties-common
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
sudo apt-key fingerprint 0EBFCD88
- sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
+ sudo add-apt-repository "deb [arch=$REPO_ARCH] https://download.docker.com/linux/ubuntu \
$(lsb_release -cs) \
stable"
sudo apt-get update
diff --git a/deploy/network.sh b/deploy/network.sh
index 218dc1d6..698771b3 100755
--- a/deploy/network.sh
+++ b/deploy/network.sh
@@ -29,6 +29,7 @@ function setup_bridge_net()
sudo virsh net-define $WORK_DIR/network/$net_name.xml
sudo virsh net-start $net_name
+ sudo virsh net-autostart $net_name
}
function recover_bridge_net()
@@ -83,6 +84,7 @@ function setup_bridge_external()
sudo virsh net-define $WORK_DIR/network/external.xml
sudo virsh net-start external
+ sudo virsh net-autostart external
python $COMPASS_DIR/deploy/setup_vnic.py
}
@@ -115,6 +117,7 @@ function setup_nat_net() {
sudo virsh net-define $WORK_DIR/network/$net_name.xml
sudo virsh net-start $net_name
+ sudo virsh net-autostart $net_name
}
function recover_nat_net() {
diff --git a/docs/release/installation/k8s-deploy.rst b/docs/release/installation/k8s-deploy.rst
index 65f638cb..49025ee3 100644
--- a/docs/release/installation/k8s-deploy.rst
+++ b/docs/release/installation/k8s-deploy.rst
@@ -20,7 +20,7 @@ If you want to deploy noha with1 controller and 1 compute, run the following com
export SCENARIO=k8-nosdn-nofeature-noha.yml
export VIRT_NUMBER=2
- curl https://raw.githubusercontent.com/opnfv/compass4nfv/euphrates/quickstart_k8s.sh | bash
+ curl https://raw.githubusercontent.com/opnfv/compass4nfv/stable/euphrates/quickstart_k8s.sh | bash
Installation of K8s on Bare Metal
=================================
diff --git a/docs/release/installation/vmdeploy.rst b/docs/release/installation/vmdeploy.rst
index 16fb28d3..5db934be 100644
--- a/docs/release/installation/vmdeploy.rst
+++ b/docs/release/installation/vmdeploy.rst
@@ -17,9 +17,10 @@ Only 1 command to try virtual deployment, if you have Internet access. Just Past
If you want to deploy noha with1 controller and 1 compute, run the following command
.. code-block:: bash
+
export SCENARIO=os-nosdn-nofeature-noha.yml
export VIRT_NUMBER=2
- curl https://raw.githubusercontent.com/opnfv/compass4nfv/euphrates/quickstart.sh | bash
+ curl https://raw.githubusercontent.com/opnfv/compass4nfv/stable/euphrates/quickstart.sh | bash
Nodes Configuration (Virtual Deployment)
----------------------------------------
diff --git a/plugins/dpdk/roles/ins_dpdk/tasks/hugepages.yml b/plugins/dpdk/roles/ins_dpdk/tasks/hugepages.yml
index 3f41cf03..d68fc031 100644
--- a/plugins/dpdk/roles/ins_dpdk/tasks/hugepages.yml
+++ b/plugins/dpdk/roles/ins_dpdk/tasks/hugepages.yml
@@ -41,5 +41,5 @@
- name: Wait for reboot
local_action:
module: wait_for
- host={{ ansible_eth0.ipv4.address }} port=22 delay=1 timeout=300
+ host={{ ansible_eth0.ipv4.address }} port=22 delay=10 timeout=1200
when: check_result.rc == 1
diff --git a/plugins/rt_kvm/roles/rt_kvm/tasks/kvm.yml b/plugins/rt_kvm/roles/rt_kvm/tasks/kvm.yml
index 5d3ca7bc..289ab19d 100644
--- a/plugins/rt_kvm/roles/rt_kvm/tasks/kvm.yml
+++ b/plugins/rt_kvm/roles/rt_kvm/tasks/kvm.yml
@@ -37,4 +37,4 @@
- name: wait for reboot
local_action:
module: wait_for
- host={{ ansible_eth0.ipv4.address }} port=22 delay=1 timeout=600
+ host={{ ansible_eth0.ipv4.address }} port=22 delay=10 timeout=1200