diff options
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 17 | ||||
| -rwxr-xr-x | ci/test.sh | 11 |
2 files changed, 15 insertions, 13 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 663e9f6c..bcd8a6bb 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -124,7 +124,7 @@ parse_setting_value() { ##parses network settings yaml into globals parse_network_settings() { local output - if output=$(python3.4 -B $LIB/python/apex-python-utils.py parse-net-settings -s $NETSETS -i $net_isolation_enabled -e $CONFIG/network-environment.yaml); then + if output=$(python3.4 -B $LIB/python/apex_python_utils.py parse-net-settings -s $NETSETS -i $net_isolation_enabled -e $CONFIG/network-environment.yaml); then echo -e "${blue}${output}${reset}" eval "$output" else @@ -136,7 +136,7 @@ parse_network_settings() { ##parses deploy settings yaml into globals parse_deploy_settings() { local output - if output=$(python3.4 -B $LIB/python/apex-python-utils.py parse-deploy-settings -f $DEPLOY_SETTINGS_FILE); then + if output=$(python3.4 -B $LIB/python/apex_python_utils.py parse-deploy-settings -f $DEPLOY_SETTINGS_FILE); then echo -e "${blue}${output}${reset}" eval "$output" else @@ -664,12 +664,12 @@ function configure_undercloud { ovs_dpdk_bridge='' fi - if ! controller_nic_template=$(python3.4 -B $LIB/python/apex-python-utils.py nic-template -r controller -s $NETSETS -i $net_isolation_enabled -t $CONFIG/nics-template.yaml.jinja2 -n "$enabled_network_list" -e $ext_net_type -af $ip_addr_family); then + if ! controller_nic_template=$(python3.4 -B $LIB/python/apex_python_utils.py nic-template -r controller -s $NETSETS -i $net_isolation_enabled -t $CONFIG/nics-template.yaml.jinja2 -n "$enabled_network_list" -e "br-ex" -af $ip_addr_family); then echo -e "${red}ERROR: Failed to generate controller NIC heat template ${reset}" exit 1 fi - if ! compute_nic_template=$(python3.4 -B $LIB/python/apex-python-utils.py nic-template -r compute -s $NETSETS -i $net_isolation_enabled -t $CONFIG/nics-template.yaml.jinja2 -n "$enabled_network_list" -e $ext_net_type -af $ip_addr_family -d "$ovs_dpdk_bridge"); then + if ! compute_nic_template=$(python3.4 -B $LIB/python/apex_python_utils.py nic-template -r compute -s $NETSETS -i $net_isolation_enabled -t $CONFIG/nics-template.yaml.jinja2 -n "$enabled_network_list" -e $ext_net_type -af $ip_addr_family -d "$ovs_dpdk_bridge"); then echo -e "${red}ERROR: Failed to generate compute NIC heat template ${reset}" exit 1 fi @@ -1115,6 +1115,15 @@ swift_endpoint_id=\$(openstack endpoint list | grep swift | cut -d ' ' -f 2) openstack endpoint delete \$swift_endpoint_id openstack service delete \$swift_service_id +if [ "${deploy_options_array['congress']}" == 'True' ]; then + for s in nova neutronv2 ceilometer cinder glancev2 keystone; do + openstack congress datasource create \$s "\$s" \\ + --config username=\$OS_USERNAME \\ + --config tenant_name=\$OS_TENANT_NAME \\ + --config password=\$OS_PASSWORD \\ + --config auth_url=\$OS_AUTH_URL + done +fi EOI echo -e "${blue}INFO: Checking if OVS bridges have IP addresses...${reset}" @@ -11,7 +11,7 @@ set -e # Make sure python dependencies are installed -for pkg in epel-release python34-devel python34-nose; do +for pkg in epel-release python34-devel python34-nose python-pep8; do if ! rpm -q ${pkg} > /dev/null; then if ! sudo yum install -y ${pkg}; then echo "Failed to install ${pkg} package..." @@ -25,12 +25,5 @@ if ! python3 -c "import coverage" &> /dev/null; then sudo easy_install-3.4 cover pushd ../build/ > /dev/null make python-tests -popd > /dev/null -pushd ../tests/ > /dev/null -percent=$(coverage3 report --include '*lib/python/*' -m | grep TOTAL | tr -s ' ' | awk '{ print $4 }' | cut -d % -f 1) -if [[ percent -lt 80 ]]; then - echo "Python Coverage: $percent" - echo "Does not meet 80% requirement" - exit 1 -fi +make python-pep8-check popd > /dev/null |