diff options
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/PR_revision.log | 4 | ||||
| -rwxr-xr-x | ci/deploy.sh | 19 | ||||
| -rwxr-xr-x | ci/util.sh | 18 |
3 files changed, 21 insertions, 20 deletions
diff --git a/ci/PR_revision.log b/ci/PR_revision.log index 15787b95..f8b11a71 100644 --- a/ci/PR_revision.log +++ b/ci/PR_revision.log @@ -38,4 +38,6 @@ 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
\ No newline at end of file +79,Fix controller and compute ip array +80,Change TenantNIC and PublicNIC to be role specific +81,Fix duplicate NeutronServicePlugins diff --git a/ci/deploy.sh b/ci/deploy.sh index b3a518fc..cd90511c 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -78,11 +78,11 @@ done display_usage() { echo -e "Usage:\n$0 [arguments] \n" - echo -e " -d|--deploy-settings : Full path to deploy settings yaml file. Optional. Defaults to null" - echo -e " -i|--inventory : Full path to inventory yaml file. Required only for baremetal" - echo -e " -n|--net-settings : Full path to network settings file. Optional." - echo -e " -p|--ping-site : site to use to verify IP connectivity. Optional. Defaults to 8.8.8.8" - echo -e " -v|--virtual : Virtualize overcloud nodes instead of using baremetal." + echo -e " --deploy-settings | -d : Full path to deploy settings yaml file. Optional. Defaults to null" + echo -e " --inventory | -i : Full path to inventory yaml file. Required only for baremetal" + echo -e " --net-settings | -n : Full path to network settings file. Optional." + echo -e " --ping-site | -p : site to use to verify IP connectivity. Optional. Defaults to 8.8.8.8" + echo -e " --virtual | -v : Virtualize overcloud nodes instead of using baremetal." echo -e " --flat : disable Network Isolation and use a single flat network for the underlay network." echo -e " --no-post-config : disable Post Install configuration." echo -e " --debug : enable debug output." @@ -97,7 +97,6 @@ display_usage() { parse_cmdline() { echo -e "\n\n${blue}This script is used to deploy the Apex Installer and Provision OPNFV Target System${reset}\n\n" echo "Use -h to display help" - sleep 2 while [ "${1:0:1}" = "-" ] do @@ -172,6 +171,7 @@ parse_cmdline() { ;; esac done + sleep 2 if [[ ! -z "$NETSETS" && "$net_isolation_enabled" == "FALSE" ]]; then echo -e "${red}INFO: Single flat network requested. Only admin_network settings will be used!${reset}" @@ -226,11 +226,10 @@ main() { exit 1 fi #Correct the time on the server prior to launching any VMs - ntpdate $ntp_server - if [ $? == 0 ]; then + if ntpdate $ntp_server; then hwclock --systohc - else - echo -e "${red} ERROR: ntpdate failed to update the time on the server. ${reset}" + else + echo "${blue}WARNING: ntpdate failed to update the time on the server. ${reset}" fi setup_undercloud_vm if [ "$virtual" == "TRUE" ]; then @@ -23,19 +23,19 @@ resolve_cmd() { display_usage() { echo -e "Usage:\n$0 subcommand [ arguments ]\n" echo -e "Arguments:\n" - echo -e " undercloud [ user [ command ] ] Connect to Undercloud VM as user and optionally execute a command\n" - echo -e " user Optional: Defaults to 'stack'\n" - echo -e " command Optional: Defaults to none\n" + echo -e " undercloud [ user [ command ] ] Connect to Undercloud VM as user and optionally execute a command" + echo -e " user Optional: Defaults to 'stack'" + echo -e " command Optional: Defaults to none" echo -e "" - echo -e " opendaylight Connect to OpenDaylight Karaf console\n" + echo -e " opendaylight Connect to OpenDaylight Karaf console" echo -e "" - echo -e " overcloud [ node [ command ] ] Connect to an Overcloud node and optionally execute a command\n" - echo -e " node Required: in format controller|compute<number>. Example: controller0\n" - echo -e " command Optional: Defaults to none\n" + echo -e " overcloud [ node [ command ] ] Connect to an Overcloud node and optionally execute a command" + echo -e " node Required: in format controller|compute<number>. Example: controller0" + echo -e " command Optional: Defaults to none" echo -e "" - echo -e " debug-stack Print parsed deployment failures to stdout \n" + echo -e " debug-stack Print parsed deployment failures to stdout" echo -e "" - echo -e " mock-detached on | off Add firewall rules to the jump host to mock a detached deployment \n" + echo -e " mock-detached on | off Add firewall rules to the jump host to mock a detached deployment\n" } ##translates the command line argument |