Revert to shell script for build version #86
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also chmod the log files we create to allow user to deleted them.
dseevr
reviewed
Mar 29, 2017
| @@ -142,4 +143,4 @@ ansible_mount="-v $(pwd)/ansible:/ansible:Z" | |||
| config_mount="-v $src_conf_path:$container_conf_path:Z" | |||
| cache_mount="-v $(pwd)/contiv_cache:/var/contiv_cache:Z" | |||
| mounts="$install_mount $ansible_mount $cache_mount $config_mount" | |||
| docker run --rm $mounts $image_name sh -c "./install/ansible/uninstall.sh $netmaster_param -a \"$ans_opts\" $uninstall_scheduler -m $contiv_network_mode -d $fwd_mode $aci_param $reset_params $cluster_param" | |||
| docker run --rm --net=host $mounts $image_name sh -c "./install/ansible/uninstall.sh $netmaster_param -a \"$ans_opts\" $uninstall_scheduler -m $contiv_network_mode -d $fwd_mode $aci_param $reset_params $cluster_param" | |||
There was a problem hiding this comment.
Why did this become --net=host?
There was a problem hiding this comment.
I made this change to the installer, but missed it in the uninstaller. Hit the issue on Linux while testing the access privileges for uninstall log file and added this.
| exit 1 | ||
| fi | ||
| fi | ||
| release=$(echo "$releases" | python -c 'import json, sys;print json.load(sys.stdin)[0]["name"]') |
| @@ -92,16 +92,16 @@ env_file=install/ansible/env.json | |||
| # Verify ansible can reach all hosts | |||
|
|
|||
| echo "Verifying ansible reachability" | |||
| ansible all $ans_opts -i $host_inventory -m setup -a 'filter=ansible_distribution*' >& $inventory_log | |||
| egrep 'FAIL|UNREACHABLE' $inventory_log >& /dev/null | |||
| ansible all $ans_opts -i $host_inventory -m setup -a 'filter=ansible_distribution*' >&$inventory_log | |||
There was a problem hiding this comment.
Good to know >& passes shfmt... TIL
|
Just a few comments, LGTM otherwise |
gaurav-dalvi
approved these changes
Mar 30, 2017
| @@ -142,4 +143,4 @@ ansible_mount="-v $(pwd)/ansible:/ansible:Z" | |||
| config_mount="-v $src_conf_path:$container_conf_path:Z" | |||
| cache_mount="-v $(pwd)/contiv_cache:/var/contiv_cache:Z" | |||
| mounts="$install_mount $ansible_mount $cache_mount $config_mount" | |||
| docker run --rm $mounts $image_name sh -c "./install/ansible/uninstall.sh $netmaster_param -a \"$ans_opts\" $uninstall_scheduler -m $contiv_network_mode -d $fwd_mode $aci_param $reset_params $cluster_param" | |||
| docker run --rm --net=host $mounts $image_name sh -c "./install/ansible/uninstall.sh $netmaster_param -a \"$ans_opts\" $uninstall_scheduler -m $contiv_network_mode -d $fwd_mode $aci_param $reset_params $cluster_param" | |||
There was a problem hiding this comment.
Will this remove NO_PROXY export in VPN as well ?
There was a problem hiding this comment.
No, it won't. That is a vagrant + VPN issue.
dseevr
approved these changes
Mar 30, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also chmod the log files we create to allow user to deleted them.
Fixes https://github.com/contiv/ccn/issues/258 and removes the python requests dependency for getting build version (fixes #85). Allows user to override BUILD_VERSION as well.