X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fpost-install-functions.sh;h=a93ad541f58553c87ed8e20efaa7c14e1d9a141e;hb=0801e5d51eb49576dea4db6d421782476a045217;hp=a23e08772c0b616a08ea549c7447ac597b4b9945;hpb=28f239b761c4b1bbe3d96c9eb2801e93db14dc7d;p=apex.git diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh index a23e0877..a93ad541 100755 --- a/lib/post-install-functions.sh +++ b/lib/post-install-functions.sh @@ -11,9 +11,12 @@ ##Post configuration after install ##params: none function configure_post_install { - local opnfv_attach_networks ovs_ip ip_range net_cidr tmp_ip af public_network_ipv6 - public_network_ipv6=False - opnfv_attach_networks="admin_network public_network" + local opnfv_attach_networks ovs_ip ip_range net_cidr tmp_ip af external_network_ipv6 + external_network_ipv6=False + opnfv_attach_networks="admin" + if [[ $enabled_network_list =~ "external" ]]; then + opnfv_attach_networks+=' external' + fi echo -e "${blue}INFO: Post Install Configuration Running...${reset}" @@ -39,15 +42,15 @@ EOI else echo -e "${blue}INFO: OVS Bridge ${NET_MAP[$network]} missing IP, will configure${reset}" # use last IP of allocation pool - eval "ip_range=\${${network}_usable_ip_range}" + eval "ip_range=\${${network}_overcloud_ip_range}" ovs_ip=${ip_range##*,} eval "net_cidr=\${${network}_cidr}" if [[ $ovs_ip =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then af=4 else af=6 - if [ "$network" == "public_network" ]; then - public_network_ipv6=True + if [ "$network" == "external" ]; then + ublic_network_ipv6=True fi #enable ipv6 on bridge interface echo 0 > /proc/sys/net/ipv6/conf/${NET_MAP[$network]}/disable_ipv6 @@ -87,38 +90,60 @@ EOI source overcloudrc set -o errexit echo "Configuring Neutron external network" -if [[ -n "$public_network_vlan" && "$public_network_vlan" != 'native' ]]; then - neutron net-create external --router:external=True --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') --provider:network_type vlan --provider:segmentation_id ${public_network_vlan} --provider:physical_network datacentre +if [[ -n "$external_nic_mapping_compute_vlan" && "$external_nic_mapping_compute_vlan" != 'native' ]]; then + neutron net-create external --router:external=True --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') --provider:network_type vlan --provider:segmentation_id ${external_nic_mapping_compute_vlan} --provider:physical_network datacentre else - neutron net-create external --router:external=True --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') + neutron net-create external --router:external=True --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') --provider:network_type flat --provider:physical_network datacentre fi -if [ "$public_network_ipv6" == "True" ]; then - neutron subnet-create --name external-net --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') external --ip_version 6 --ipv6_ra_mode slaac --ipv6_address_mode slaac --gateway ${public_network_gateway} --allocation-pool start=${public_network_floating_ip_range%%,*},end=${public_network_floating_ip_range##*,} ${public_network_cidr} +if [ "$external_network_ipv6" == "True" ]; then + neutron subnet-create --name external-net --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') external --ip_version 6 --ipv6_ra_mode slaac --ipv6_address_mode slaac --gateway ${external_gateway} --allocation-pool start=${external_floating_ip_range%%,*},end=${external_floating_ip_range##*,} ${external_cidr} +elif [[ "$enabled_network_list" =~ "external" ]]; then + neutron subnet-create --name external-net --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') --disable-dhcp external --gateway ${external_gateway} --allocation-pool start=${external_floating_ip_range%%,*},end=${external_floating_ip_range##*,} ${external_cidr} else - neutron subnet-create --name external-net --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') --disable-dhcp external --gateway ${public_network_gateway} --allocation-pool start=${public_network_floating_ip_range%%,*},end=${public_network_floating_ip_range##*,} ${public_network_cidr} + # we re-use the introspection range for floating ips with single admin network + neutron subnet-create --name external-net --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') --disable-dhcp external --gateway ${admin_gateway} --allocation-pool start=${admin_introspection_range%%,*},end=${admin_introspection_range##*,} ${admin_cidr} +fi + +if [ "${deploy_options_array['gluon']}" == 'True' ]; then + echo "Creating Gluon dummy network and subnet" + neutron net-create --shared --provider:network_type vxlan GluonNetwork + neutron subnet-create --name GluonSubnet --no-gateway --disable-dhcp GluonNetwork 0.0.0.0/1 fi echo "Removing sahara endpoint and service" sahara_service_id=\$(openstack service list | grep sahara | cut -d ' ' -f 2) sahara_endpoint_id=\$(openstack endpoint list | grep sahara | cut -d ' ' -f 2) -openstack endpoint delete \$sahara_endpoint_id -openstack service delete \$sahara_service_id +[[ -n "\$sahara_endpoint_id" ]] && openstack endpoint delete \$sahara_endpoint_id +[[ -n "\$sahara_service_id" ]] && openstack service delete \$sahara_service_id echo "Removing swift endpoint and service" swift_service_id=\$(openstack service list | grep swift | cut -d ' ' -f 2) swift_endpoint_id=\$(openstack endpoint list | grep swift | cut -d ' ' -f 2) -openstack endpoint delete \$swift_endpoint_id -openstack service delete \$swift_service_id +[[ -n "\$swift_endpoint_id" ]] && openstack endpoint delete \$swift_endpoint_id +[[ -n "\$swift_service_id" ]] && openstack service delete \$swift_service_id + +if [ "${deploy_options_array['dataplane']}" == 'fdio' ] || [ "${deploy_options_array['dataplane']}" == 'ovs_dpdk' ]; then + for flavor in \$(openstack flavor list -c Name -f value); do + echo "INFO: Configuring \$flavor to use hugepage" + nova flavor-key \$flavor set hw:mem_page_size=large + done +fi if [ "${deploy_options_array['congress']}" == 'True' ]; then ds_configs="--config username=\$OS_USERNAME - --config tenant_name=\$OS_TENANT_NAME + --config tenant_name=\$OS_PROJECT_NAME --config password=\$OS_PASSWORD --config auth_url=\$OS_AUTH_URL" - for s in nova neutronv2 ceilometer cinder glancev2 keystone; do + for s in nova neutronv2 cinder glancev2 keystone; do ds_extra_configs="" if [ "\$s" == "nova" ]; then - nova_micro_version=\$(nova version-list | grep CURRENT | awk '{print \$10}') + # nova's latest version is 2.38 but congress relies on nova to do + # floating ip operation instead of neutron. fip support in nova + # was depricated as of 2.35. Hard coding 2.34 for danube. + # Carlos.Goncalves working on fixes for upstream congress that + # should be ready for ocata. + nova_micro_version="2.34" + #nova_micro_version=\$(nova version-list | grep CURRENT | awk '{print \$10}') ds_extra_configs+="--config api_version=\$nova_micro_version" fi if openstack congress datasource create \$s "\$s" \$ds_configs \$ds_extra_configs; then @@ -133,16 +158,44 @@ if [ "${deploy_options_array['congress']}" == 'True' ]; then echo "WARN: Datsource: doctor could NOT be created" fi fi + + +# Fix project_id and os_tenant_name not in overcloudrc +# Deprecated openstack client does not need project_id +# and os_tenant_name anymore but glance client and +# Rally in generall does need it. +# REMOVE when not needed in Rally/glance-client anymore. +if ! grep -q "OS_PROJECT_ID" ./overcloudrc;then + project_id=\$(openstack project list |grep admin|awk '{print \$2}') + echo "export OS_PROJECT_ID=\$project_id" >> ./overcloudrc +fi +if ! grep -q "OS_TENANT_NAME" ./overcloudrc;then + echo "export OS_TENANT_NAME=admin" >> ./overcloudrc +fi + + EOI - # for virtual, we NAT public network through Undercloud + # we need to restart neutron-server in Gluon deployments to allow the Gluon core + # plugin to correctly register itself with Neutron + if [ "${deploy_options_array['gluon']}" == 'True' ]; then + echo "Restarting neutron-server to finalize Gluon installation" + overcloud_connect "controller0" "sudo systemctl restart neutron-server" + fi + + # for virtual, we NAT external network through Undercloud # same goes for baremetal if only jumphost has external connectivity - if [ "$virtual" == "TRUE" ] || ! test_overcloud_connectivity && [ "$public_network_ipv6" != "True" ]; then - if ! configure_undercloud_nat ${public_network_cidr}; then - echo -e "${red}ERROR: Unable to NAT undercloud with external net: ${public_network_cidr}${reset}" + if [ "$virtual" == "TRUE" ] || ! test_overcloud_connectivity && [ "$external_network_ipv6" != "True" ]; then + if [[ "$enabled_network_list" =~ "external" ]]; then + nat_cidr=${external_cidr} + else + nat_cidr=${admin_cidr} + fi + if ! configure_undercloud_nat ${nat_cidr}; then + echo -e "${red}ERROR: Unable to NAT undercloud with external net: ${nat_cidr}${reset}" exit 1 else - echo -e "${blue}INFO: Undercloud VM has been setup to NAT Overcloud public network${reset}" + echo -e "${blue}INFO: Undercloud VM has been setup to NAT Overcloud external network${reset}" fi fi @@ -166,6 +219,29 @@ EOI overcloud_connect "compute0" "sudo sh -c 'cd /var/opt/vsperf/systems/ && ./build_base_machine.sh 2>&1 > /var/log/vsperf.log'" fi + # install docker + if [ "${deploy_options_array['yardstick']}" == 'True' ] || [ "${deploy_options_array['dovetail']}" == 'True' ]; then + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" < /dev/null || echo 'WARNING: zrpcd is not running on controller0'" fi }