Install branch built v2plugin #307
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
|
works with contiv/ansible#382 |
chrisplo
force-pushed
the
v2plugin_branch_install
branch
2 times, most recently
from
09ee370 to
96e9362
Compare
Works with: contiv/ansible#382 When building the installer, prepare_netplugin_artifacts.sh will now also build the v2plugin locally if the NETPLUGIN_BRANCH variable is set, and move those to the staging area so that build.sh can move them to the contiv_cache directory in the installer. The newer contiv/ansible will detect the v2plugin archive and install it instead of doing docker plugin install from dockerhub. prepare_netplugin_tarball.sh was renamed to prepare_netplugin_artifacts.sh because it does more than just prepare a tarball now. Drive-by: * Bumps the default contiv version to 1.1.7 * v2plugin version defaults to the default contiv version Signed-off-by: Chris Plock <chrisplo@cisco.com>
chrisplo
force-pushed
the
v2plugin_branch_install
branch
from
96e9362 to
e6e8cc8
Compare
|
build PR |
tiewei
reviewed
Nov 21, 2017
Makefile
Outdated
| export CONTIV_ANSIBLE_OWNER ?= contiv | ||
| export CONTIV_V2PLUGIN_TARBALL_NAME := v2plugin-$(CONTIV_V2PLUGIN_VERSION).tar.gz | ||
| export CONTIV_ANSIBLE_COMMIT ?= build_v2plugin_on_demand | ||
| export CONTIV_ANSIBLE_OWNER ?= chrisplo |
There was a problem hiding this comment.
roll these two lines back when contiv/ansible#382 merged
…tall Conflicts were in Makefile, on CONTIV_ANSIBLE_COMMIT and a couple added variables right after that
|
build PR |
|
build PR |
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.
Works with:
contiv/ansible#382
env.json now passes a flag to build the v2plugin at install time or
not, and that flag is managed during build.sh based on if
NETPLUGIN_BRANCH is set during build.
All the scripts and resources in netplugin:install/v2plugin are copied
to the install archive's staging directory then into the installer
archive.
renamed prepare_netplugin_tarball.sh to prepare_netplugin_artifacts.sh
because it does more than just prepare a tarball now
Drive-by:
Signed-off-by: Chris Plock chrisplo@cisco.com