diff options
8 files changed, 24 insertions, 1 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 06606414e..80667e815 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -274,6 +274,12 @@ if [ "${DEPLOY_TYPE}" = 'baremetal' ]; then python python-ipaddress python-jinja2 fi +# AArch64 VMs use AAVMF (guest UEFI) +if [ "$(uname -m)" = 'aarch64' ]; then + [ -n "$(command -v apt-get)" ] && sudo apt-get install -y qemu-efi + [ -n "$(command -v yum)" ] && sudo yum install -y --skip-broken AAVMF +fi + if ! virsh list >/dev/null 2>&1; then notify "[ERROR] This script requires hypervisor access\n" 1>&2 exit 1 diff --git a/docs/release/installation/installation.instruction.rst b/docs/release/installation/installation.instruction.rst index 652c85558..b27963055 100644 --- a/docs/release/installation/installation.instruction.rst +++ b/docs/release/installation/installation.instruction.rst @@ -380,6 +380,9 @@ Examples Fuel@OPNFV LF POD2 Network Layout + Once the deployment is complete, the SaltStack Deployment Documentation is + available at http://<Proxy VIP>:8090, e.g. http://172.30.10.103:8090. + An aarch64 deploy on pod5 from Arm lab .. code-block:: bash @@ -396,6 +399,9 @@ Examples Fuel@OPNFV ARM POD5 Network Layout + Once the deployment is complete, the SaltStack Deployment Documentation is + available at http://<Proxy VIP>:8090, e.g. http://10.0.8.103:8090. + Pod Descriptor Files ==================== diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index c3a51a85a..9eaa3a15b 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -64,7 +64,7 @@ salt -I 'ceilometer:agent' state.sls ceilometer salt -I 'horizon:server' state.sls horizon salt -I 'apache:server' state.sls apache -salt -I 'nginx:server' state.sls nginx +salt -I 'nginx:server' state.sls nginx,sphinx clstr_vip_addr=$(salt -C 'I@nginx:server and *01*' --out=yaml \ pillar.get _param:cluster_vip_address | awk '{print $2; exit}') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml index 7d3dcb075..30dda2f7f 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml @@ -52,3 +52,6 @@ parameters: sysctl: vm.dirty_ratio: 10 vm.dirty_background_ratio: 5 + neutron: + gateway: + vlan_aware_vms: true diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml index 2aa05f07d..6d942281c 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml @@ -46,6 +46,9 @@ parameters: interface: dhcp: ${_param:linux_dhcp_interface} single: ${_param:linux_single_interface} + neutron: + server: + vlan_aware_vms: true keystone: server: cacert: /etc/ssl/certs/mcp_os_cacert diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml index 4a48b360e..ad0675475 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml @@ -37,6 +37,7 @@ parameters: neutron: compute: notification: true + vlan_aware_vms: true agent_mode: ${_param:neutron_compute_agent_mode} message_queue: host: ${_param:openstack_control_address} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml index 2288e687f..ab5833910 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml @@ -143,3 +143,6 @@ parameters: - rw - no_root_squash - async + neutron: + server: + vlan_aware_vms: true diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml index c776babcc..4ed8eed77 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml @@ -20,6 +20,7 @@ parameters: gateway: notification: true agent_mode: ${_param:neutron_gateway_agent_mode} + vlan_aware_vms: true linux: network: bridge: openvswitch |