diff options
| -rwxr-xr-x | build.sh | 9 | ||||
| -rw-r--r-- | deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml | 5 | ||||
| -rwxr-xr-x | deploy/adapters/ansible/roles/post-osa/files/sfc.conf | 9 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/post-osa/tasks/install_networking_sfc.yml | 73 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/post-osa/tasks/main.yml | 7 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/post-osa/vars/main.yml | 5 | ||||
| -rwxr-xr-x | deploy/network.sh | 3 | ||||
| -rw-r--r-- | docs/release/installation/k8s-deploy.rst | 2 | ||||
| -rw-r--r-- | docs/release/installation/vmdeploy.rst | 3 | ||||
| -rw-r--r-- | plugins/dpdk/roles/ins_dpdk/tasks/hugepages.yml | 2 | ||||
| -rw-r--r-- | plugins/rt_kvm/roles/rt_kvm/tasks/kvm.yml | 2 |
11 files changed, 114 insertions, 6 deletions
@@ -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/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml index ef7128c5..8d944387 100644 --- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml +++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml @@ -41,7 +41,10 @@ - setup-openstack - sync-inventory -- hosts: compute +- hosts: + - compute + - utility + - neutron_server remote_user: root roles: - post-osa diff --git a/deploy/adapters/ansible/roles/post-osa/files/sfc.conf b/deploy/adapters/ansible/roles/post-osa/files/sfc.conf new file mode 100755 index 00000000..ce42c9e1 --- /dev/null +++ b/deploy/adapters/ansible/roles/post-osa/files/sfc.conf @@ -0,0 +1,9 @@ +[DEFAULT] + +service_plugins = router,metering,flow_classifier,sfc + +[sfc] +drivers = ovs + +[flowclassifier] +drivers = ovs diff --git a/deploy/adapters/ansible/roles/post-osa/tasks/install_networking_sfc.yml b/deploy/adapters/ansible/roles/post-osa/tasks/install_networking_sfc.yml new file mode 100644 index 00000000..fbed5815 --- /dev/null +++ b/deploy/adapters/ansible/roles/post-osa/tasks/install_networking_sfc.yml @@ -0,0 +1,73 @@ +--- + +- name: install networking-sfc + pip: + name: networking-sfc + virtualenv: /openstack/venvs/neutron-15.1.4 + when: + - inventory_hostname in groups['neutron_server'] + +- name: install crudini + package: + name: crudini + state: latest + when: + - inventory_hostname in groups['neutron_server'] + +- name: Install networking-sfc for CLI + pip: + name: networking-sfc + when: + - inventory_hostname in groups['utility'] + +- name: turn off neutron-server on control node + service: name=neutron-server state=stopped + when: inventory_hostname in groups['neutron_server'] + +- name: copy sfc.conf + copy: + src: "{{ sfc_plugins.src }}" + dest: "{{ sfc_plugins.dst }}" + mode: 0755 + when: inventory_hostname in groups['neutron_server'] + +- name: Configure SFC driver + shell: crudini --merge /etc/neutron/neutron.conf < /opt/sfc.conf + when: inventory_hostname in groups['neutron_server'] + +- name: delete sfc.conf + shell: rm -rf {{ sfc_plugins.dst }} + when: inventory_hostname in groups['neutron_server'] + +- name: Perform a Neutron DB online upgrade + command: | + /openstack/venvs/neutron-15.1.4/bin/neutron-db-manage + --config-file /etc/neutron/neutron.conf + --config-file /etc/neutron/plugins/ml2/ml2_conf.ini + upgrade --expand + become: "yes" + become_user: "neutron" + when: inventory_hostname in groups['neutron_server'][0] + +- name: Perform a Neutron DB offline upgrade + command: | + /openstack/venvs/neutron-15.1.4/bin/neutron-db-manage + --config-file /etc/neutron/neutron.conf + --config-file /etc/neutron/plugins/ml2/ml2_conf.ini + upgrade --contract + become: "yes" + become_user: "neutron" + when: inventory_hostname in groups['neutron_server'][0] + +- name: SFC DB upgrade + command: | + /openstack/venvs/neutron-15.1.4/bin/neutron-db-manage + --subproject networking-sfc + upgrade head + become: "yes" + become_user: "neutron" + when: inventory_hostname in groups['neutron_server'][0] + +- name: turn on neutron-server on control node + service: name=neutron-server state=started + when: inventory_hostname in groups['neutron_server'] diff --git a/deploy/adapters/ansible/roles/post-osa/tasks/main.yml b/deploy/adapters/ansible/roles/post-osa/tasks/main.yml index c48a5d1a..f7f7a6cc 100644 --- a/deploy/adapters/ansible/roles/post-osa/tasks/main.yml +++ b/deploy/adapters/ansible/roles/post-osa/tasks/main.yml @@ -8,3 +8,10 @@ ############################################################################## --- - include: "{{ ansible_distribution }}.yml" + when: inventory_hostname in groups['compute'] + +# install networking-sfc for non odl scenarios +- include: install_networking_sfc.yml + when: + - odl_sfc is not defined or odl_sfc == "Disable" + - inventory_hostname not in groups['compute'] diff --git a/deploy/adapters/ansible/roles/post-osa/vars/main.yml b/deploy/adapters/ansible/roles/post-osa/vars/main.yml new file mode 100644 index 00000000..4feb9756 --- /dev/null +++ b/deploy/adapters/ansible/roles/post-osa/vars/main.yml @@ -0,0 +1,5 @@ +--- + +sfc_plugins: + src: sfc.conf + dst: /opt/sfc.conf 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 |