diff options
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/PR_revision.log | 7 | ||||
| -rwxr-xr-x | ci/clean.sh | 10 | ||||
| -rwxr-xr-x | ci/deploy.sh | 34 |
3 files changed, 34 insertions, 17 deletions
diff --git a/ci/PR_revision.log b/ci/PR_revision.log index d5b5740d..f8b11a71 100644 --- a/ci/PR_revision.log +++ b/ci/PR_revision.log @@ -34,3 +34,10 @@ 68,Fix neutron host name 69,Fix vpp mount 72,Fix compute node preconfig DPDK +75,Add AggregateInstanceExtraSpecFilter to Scheduler +76,Add networking-vpp ML2 mechanism driver +77,Update FDIO to use opendaylight_v2 mechanism driver +78,Fix spelling mistake in specs filter +79,Fix controller and compute ip array +80,Change TenantNIC and PublicNIC to be role specific +81,Fix duplicate NeutronServicePlugins diff --git a/ci/clean.sh b/ci/clean.sh index e4b2d106..c00a4df2 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -30,8 +30,12 @@ for lib in common-functions parse-functions; do done vm_index=4 -ovs_bridges="br-admin br-private br-public br-storage" -OPNFV_NETWORK_TYPES="admin_network private_network public_network storage_network api_network" +ovs_bridges="br-admin br-tenant br-public br-storage" +ovs_bridges+=" br-private br-external" # Legecy names, remove in E river + +#OPNFV_NETWORK_TYPES=$(python3 -c 'from apex.common.constants import OPNFV_NETWORK_TYPES; print(" ".join(OPNFV_NETWORK_TYPES))') +OPNFV_NETWORK_TYPES+=" admin tenant external storage api" +OPNFV_NETWORK_TYPES+=" admin_network private_network public_network storage_network api_network" # Legecy names, remove in E river display_usage() { @@ -75,7 +79,7 @@ parse_cmdline "$@" if [ -n "$INVENTORY_FILE" ]; then echo -e "${blue}INFO: Parsing inventory file...${reset}" - if ! python3.4 -B $LIB/python/apex_python_utils.py clean -f ${INVENTORY_FILE}; then + if ! python3 -B $LIB/python/apex_python_utils.py clean -f ${INVENTORY_FILE}; then echo -e "${red}WARN: Unable to shutdown all nodes! Please check /var/log/apex.log${reset}" else echo -e "${blue}INFO: Node shutdown complete...${reset}" diff --git a/ci/deploy.sh b/ci/deploy.sh index 91663dfc..ee0ea3ba 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -179,8 +179,19 @@ parse_cmdline() { exit 1 fi - if [[ -n "$virtual" && -n "$INVENTORY_FILE" ]]; then - echo -e "${red}ERROR: You should not specify an inventory with virtual deployments${reset}" + # inventory file usage validation + if [[ -n "$virtual" ]]; then + if [[ -n "$INVENTORY_FILE" ]]; then + echo -e "${red}ERROR: You should not specify an inventory file with virtual deployments${reset}" + exit 1 + else + INVENTORY_FILE='/tmp/inventory-virt.yaml' + fi + elif [[ -z "$INVENTORY_FILE" ]]; then + echo -e "${red}ERROR: You must specify an inventory file for baremetal deployments! Exiting...${reset}" + exit 1 + elif [[ ! -f "$INVENTORY_FILE" ]]; then + echo -e "{$red}ERROR: Inventory File: ${INVENTORY_FILE} does not exist! Exiting...${reset}" exit 1 fi @@ -194,16 +205,6 @@ parse_cmdline() { exit 1 fi - if [[ ! -z "$INVENTORY_FILE" && ! -f "$INVENTORY_FILE" ]]; then - echo -e "{$red}ERROR: Inventory File: ${INVENTORY_FILE} does not exist! Exiting...${reset}" - exit 1 - fi - - if [[ -z "$virtual" && -z "$INVENTORY_FILE" ]]; then - echo -e "${red}ERROR: You must specify an inventory file for baremetal deployments! Exiting...${reset}" - exit 1 - fi - if [[ "$net_isolation_enabled" == "FALSE" && "$post_config" == "TRUE" ]]; then echo -e "${blue}INFO: Post Install Configuration will be skipped. It is not supported with --flat${reset}" post_config="FALSE" @@ -223,12 +224,17 @@ main() { echo -e "${red}Dependency Validation Failed, Exiting.${reset}" exit 1 fi + #Correct the time on the server prior to launching any VMs + if ntpdate $ntp_server; then + hwclock --systohc + else + echo "${blue}WARNING: ntpdate failed to update the time on the server. ${reset}" + fi setup_undercloud_vm if [ "$virtual" == "TRUE" ]; then setup_virtual_baremetal $VM_CPUS $VM_RAM - elif [ -n "$INVENTORY_FILE" ]; then - parse_inventory_file fi + parse_inventory_file configure_undercloud overcloud_deploy if [ "$post_config" == "TRUE" ]; then |