summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-06-16 15:53:46 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-06-18 15:28:02 +0000
commite3ba68f6e5c5080a23e9421e6bc72ef7ba868257 (patch)
tree5cbe6afec4d13236b38cdf3eb2f4d194dd9f8eb2
parent1b62dd60dfaf6fe9e6087fb51e734f2392326433 (diff)
downloaddefinitions-e3ba68f6e5c5080a23e9421e6bc72ef7ba868257.tar.gz
Move ebtables to networking-utils
Makes more sense to have ebtables in networking-utils than in virtualization. Change-Id: Ic71d89b5997f3b5ea020ab2a8d81fe6755df0a87
-rw-r--r--strata/networking-utils.morph5
-rw-r--r--strata/networking-utils/ebtables.morph (renamed from strata/virtualization/ebtables.morph)0
-rw-r--r--strata/virtualization.morph11
3 files changed, 8 insertions, 8 deletions
diff --git a/strata/networking-utils.morph b/strata/networking-utils.morph
index 6df579ad..445df46d 100644
--- a/strata/networking-utils.morph
+++ b/strata/networking-utils.morph
@@ -9,6 +9,11 @@ description: |
build-depends:
- morph: strata/foundation.morph
chunks:
+- name: ebtables
+ morph: strata/networking-utils/ebtables.morph
+ repo: upstream:ebtables
+ ref: f4bdc80ae8c1a79b4ab5dcb8431ad85aea618d66
+ unpetrify-ref: master
- name: iproute2
morph: strata/networking-utils/iproute2.morph
repo: upstream:iproute2
diff --git a/strata/virtualization/ebtables.morph b/strata/networking-utils/ebtables.morph
index a4d9fc76..a4d9fc76 100644
--- a/strata/virtualization/ebtables.morph
+++ b/strata/networking-utils/ebtables.morph
diff --git a/strata/virtualization.morph b/strata/virtualization.morph
index 548019aa..f2f1a401 100644
--- a/strata/virtualization.morph
+++ b/strata/virtualization.morph
@@ -3,8 +3,8 @@ kind: stratum
description: |
Virtualization for baserock
NOTE: this stratum requires kernel support, please see openstack bsp
- kernel history to check which config are needed for openvswitch, libvirt,
- or ebtables, for example.
+ kernel history to check which config are needed for openvswitch or libvirt,
+ for example.
build-depends:
- morph: strata/libsoup-common.morph
- morph: strata/python-core.morph
@@ -12,6 +12,7 @@ build-depends:
- morph: strata/connman-common.morph
- morph: strata/lvm.morph
- morph: strata/xorg-util-macros-common.morph
+- morph: strata/networking-utils.morph
chunks:
- name: yajl
morph: strata/virtualization/yajl.morph
@@ -42,11 +43,6 @@ chunks:
repo: upstream:dmidecode
ref: 47a0aa5d6696a83922ee70279b7253a4e55947d5
unpetrify-ref: master
-- name: ebtables
- morph: strata/virtualization/ebtables.morph
- repo: upstream:ebtables
- ref: f4bdc80ae8c1a79b4ab5dcb8431ad85aea618d66
- unpetrify-ref: master
- name: libvirt
morph: strata/virtualization/libvirt.morph
repo: upstream:libvirt
@@ -59,7 +55,6 @@ chunks:
- xml-catalog
- yajl
- dmidecode
- - ebtables
- name: pycurl
repo: upstream:pycurl
ref: 5ca370827d88817eeca3c56cbb37e4ddccc16c6e