diff options
Diffstat (limited to 'ci/deploy.sh')
-rwxr-xr-x | ci/deploy.sh | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index cd90511c..edc6062a 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -25,8 +25,6 @@ green=$(tput setaf 2 || echo "") interactive="FALSE" ping_site="8.8.8.8" ntp_server="pool.ntp.org" -net_isolation_enabled="TRUE" -net_isolation_arg="" post_config="TRUE" debug="FALSE" @@ -42,18 +40,18 @@ DEPLOY_OPTIONS="" CONFIG=${CONFIG:-'/var/opt/opnfv'} RESOURCES=${RESOURCES:-"$CONFIG/images"} LIB=${LIB:-"$CONFIG/lib"} -OPNFV_NETWORK_TYPES="admin_network private_network public_network storage_network api_network" +OPNFV_NETWORK_TYPES="admin tenant external storage api" VM_CPUS=4 VM_RAM=8 VM_COMPUTES=1 # Netmap used to map networks to OVS bridge names -NET_MAP['admin_network']="br-admin" -NET_MAP['private_network']="br-private" -NET_MAP['public_network']="br-public" -NET_MAP['storage_network']="br-storage" -NET_MAP['api_network']="br-api" +NET_MAP['admin']="br-admin" +NET_MAP['tenant']="br-tenant" +NET_MAP['external']="br-external" +NET_MAP['storage']="br-storage" +NET_MAP['api']="br-api" ext_net_type="interface" ip_address_family=4 @@ -129,12 +127,6 @@ parse_cmdline() { echo "Executing a Virtual Deployment" shift 1 ;; - --flat ) - net_isolation_enabled="FALSE" - net_isolation_arg="--flat" - echo "Underlay Network Isolation Disabled: using flat configuration" - shift 1 - ;; --no-post-config ) post_config="FALSE" echo "Post install configuration disabled" @@ -173,9 +165,7 @@ parse_cmdline() { 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}" - elif [[ -z "$NETSETS" ]]; then + if [[ -z "$NETSETS" ]]; then echo -e "${red}ERROR: You must provide a network_settings file with -n.${reset}" exit 1 fi @@ -206,11 +196,6 @@ parse_cmdline() { 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" - fi - } main() { @@ -247,7 +232,7 @@ main() { fi fi if [[ "${deploy_options_array['sdn_controller']}" == 'onos' ]]; then - if ! onos_update_gw_mac ${public_network_cidr} ${public_network_gateway}; then + if ! onos_update_gw_mac ${external_cidr} ${external_gateway}; then echo -e "${red}ERROR:ONOS Post Install Configuration Failed, Exiting.${reset}" exit 1 else |