diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-28 12:58:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-28 12:58:24 +0000 |
| commit | 7cb304c6b4fb8d84c72851d720f4bb02af6b31ee (patch) | |
| tree | 2d9dadb19e5326aacd60c5af3ea15a0572d2cb15 | |
| parent | 293e752ad5f422359c8d0efa0a51fbb484318212 (diff) | |
| parent | 51080a20160ae460592fc67cfef282290458e2e7 (diff) | |
Merge "submodule: fuel-plugin-ovs."
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0010-Allow-overriding-ovs-git-info.patch | 22 | ||||
| m--------- | upstream/fuel-plugin-ovs | 0 |
4 files changed, 28 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index e04803a8..3069a650 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,3 +26,7 @@ path = upstream/fuel-nailgun-agent url = https://github.com/openstack/fuel-nailgun-agent branch = stable/mitaka +[submodule "fuel-plugin-ovs"] + path = upstream/fuel-plugin-ovs + url = https://github.com/openstack/fuel-plugin-ovs + branch = master @@ -71,6 +71,8 @@ build: FUEL_MIRROR_REPO=${root}/upstream/fuel-mirror \ ODL_REPO=${root}/upstream/fuel-plugin-opendaylight \ ODL_CHANGE= \ + OVS_NSH_DPDK_REPO=${root}/upstream/fuel-plugin-ovs \ + OVS_NSH_DPDK_BRANCH=HEAD \ FUELLIB_COMMIT=HEAD \ NAILGUN_COMMIT=HEAD \ FUEL_AGENT_COMMIT=HEAD \ diff --git a/patches/opnfv-fuel/0010-Allow-overriding-ovs-git-info.patch b/patches/opnfv-fuel/0010-Allow-overriding-ovs-git-info.patch new file mode 100644 index 00000000..ba09b31b --- /dev/null +++ b/patches/opnfv-fuel/0010-Allow-overriding-ovs-git-info.patch @@ -0,0 +1,22 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Mon, 20 Jun 2016 17:49:51 +0200 +Subject: [PATCH] Allow overriding ovs git info. + +--- + build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk +index 819379e..97dc4e1 100644 +--- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk ++++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk +@@ -7,6 +7,6 @@ + # http://www.apache.org/licenses/LICENSE-2.0 + ############################################################################## + +-OVS_NSH_DPDK_BRANCH=fd77b5d48782e67306c3763dc1908f0fb342c51d +-OVS_NSH_DPDK_REPO=https://review.openstack.org/openstack/fuel-plugin-ovs +-OVS_NSH_DPDK_CHANGE= ++OVS_NSH_DPDK_BRANCH?=fd77b5d48782e67306c3763dc1908f0fb342c51d ++OVS_NSH_DPDK_REPO?=https://review.openstack.org/openstack/fuel-plugin-ovs ++OVS_NSH_DPDK_CHANGE?= diff --git a/upstream/fuel-plugin-ovs b/upstream/fuel-plugin-ovs new file mode 160000 +Subproject bee1b2b540922f0a1439d3b878480da590f506d |