summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-13 16:20:33 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-13 16:20:33 +0000
commita2be876989a0d6f4d617dd9fd661d0eb26b5da2f (patch)
treed56a5629b39475db5e1b7c23f61dd83a405686aa
parent898c63f66702b26ec3376f48aeeacccfd85796fc (diff)
parentbc5300f4a1c11bc2e181cabc40a7e1033e63f37d (diff)
downloaddefinitions-a2be876989a0d6f4d617dd9fd661d0eb26b5da2f.tar.gz
Merge branch 'baserock/franred/update-qemu-libvirt-add-virtualization-packages'
Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk> Reviewed-by: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
-rw-r--r--strata/virtualization.morph42
-rw-r--r--strata/virtualization/dmidecode.morph7
-rw-r--r--strata/virtualization/ebtables.morph7
-rw-r--r--strata/virtualization/libvirt.morph27
-rw-r--r--strata/virtualization/openvswitch.morph11
5 files changed, 84 insertions, 10 deletions
diff --git a/strata/virtualization.morph b/strata/virtualization.morph
index 7aa8f6af..881b53de 100644
--- a/strata/virtualization.morph
+++ b/strata/virtualization.morph
@@ -1,8 +1,13 @@
name: virtualization
kind: stratum
-description: virtualization for baserock
+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.
build-depends:
- morph: strata/connman-common.morph
+- morph: strata/lvm.morph
chunks:
- name: yajl
morph: strata/virtualization/yajl.morph
@@ -25,8 +30,8 @@ chunks:
- name: qemu
morph: strata/virtualization/qemu.morph
repo: upstream:qemu
- ref: f8d1fb61e65575011a67d7ba97b690feb5630c91
- unpetrify-ref: baserock/morph
+ ref: c5691f7ecb32cbe7a95b491314ce070e211fd97d
+ unpetrify-ref: baserock/v2.2.0
build-depends: []
- name: xorg-util-macros
repo: upstream:xorg-util-macros
@@ -39,17 +44,24 @@ chunks:
unpetrify-ref: master
build-depends:
- xorg-util-macros
+- name: dmidecode
+ morph: strata/virtualization/dmidecode.morph
+ repo: upstream:dmidecode
+ ref: 47a0aa5d6696a83922ee70279b7253a4e55947d5
+ unpetrify-ref: master
+ build-depends: []
- name: libvirt
morph: strata/virtualization/libvirt.morph
repo: upstream:libvirt
- ref: 13b7bb4acba9b70e015b7faa020b08018885aad8
- unpetrify-ref: baserock/morph
+ ref: 7b1ceec1e2f141d36ed9b7ef3a660ff8bb34fc53
+ unpetrify-ref: baserock/v1.2.10
build-depends:
- libpciaccess
- dnsmasq
- qemu
- xml-catalog
- yajl
+ - dmidecode
- name: pycurl
repo: upstream:pycurl
ref: 5ca370827d88817eeca3c56cbb37e4ddccc16c6e
@@ -74,16 +86,16 @@ chunks:
- cython
- name: libvirt-python
repo: upstream:libvirt-python
- ref: 4382fc518cbd11d9af5727fb403e175818c25db5
- unpetrify-ref: v1.2.2
+ ref: 8e09c79a07b097a6ba9af83be4916fb9c9538500
+ unpetrify-ref: v1.2.10
build-depends:
- libvirt
- python-lxml
- urlgrabber
- name: gnome-common
repo: upstream:gnome-common
- ref: 766c35359ef924ceb2288c14c2d6239fcc0618f8
- unpetrify-ref: 3.7.4
+ ref: d213283fcb5228d05eb2c796579f18240e8467e8
+ unpetrify-ref: 3.12.0
build-depends: []
- name: pygobject
morph: strata/virtualization/pygobject.morph
@@ -114,3 +126,15 @@ chunks:
build-depends:
- libvirt-python
- libosinfo
+- name: ebtables
+ morph: strata/virtualization/ebtables.morph
+ repo: upstream:ebtables
+ ref: 09792f0107a9318da809908db31f0b826017de7b
+ unpetrify-ref: master
+ build-depends: []
+- name: openvswitch
+ morph: strata/virtualization/openvswitch.morph
+ repo: upstream:openvswitch
+ ref: a52b0492a4d0398a24ed2a3566ff55ac53fea31f
+ unpretrify-ref: master
+ build-depends: []
diff --git a/strata/virtualization/dmidecode.morph b/strata/virtualization/dmidecode.morph
new file mode 100644
index 00000000..d9ab0fa3
--- /dev/null
+++ b/strata/virtualization/dmidecode.morph
@@ -0,0 +1,7 @@
+name: dmidecode
+kind: chunk
+build-system: manual
+build-commands:
+- make
+install-commands:
+- make install DESTDIR="$DESTDIR" prefix="$PREFIX"
diff --git a/strata/virtualization/ebtables.morph b/strata/virtualization/ebtables.morph
new file mode 100644
index 00000000..8be1b4f2
--- /dev/null
+++ b/strata/virtualization/ebtables.morph
@@ -0,0 +1,7 @@
+name: ebtables
+kind: chunk
+build-system: manual
+build-commands:
+- make
+install-commands:
+- make install DESTDIR="$DESTDIR" BINDIR="$DESDIR"/sbin
diff --git a/strata/virtualization/libvirt.morph b/strata/virtualization/libvirt.morph
index 63b5d768..e6d348bb 100644
--- a/strata/virtualization/libvirt.morph
+++ b/strata/virtualization/libvirt.morph
@@ -3,4 +3,29 @@ kind: chunk
build-system: autotools
configure-commands:
- |
- GNULIB_SRCDIR=gnulib-src ./autogen.sh --without-apparmor --with-attr --without-audit --without-avahi --with-blkid --without-capng --with-curl --with-dbus --with-fuse --without-glusterfs --without-hal --without-netcf --without-numactl --without-openwsman --with-pciaccess --without-readline --without-sanlock --without-sasl --without-selinux --without-ssh2 --with-systemd-daemon --with-udev --with-yajl --without-xen --with-qemu --without-uml --without-openvz --without-vmware --without-phyp --without-xenapi --without-libxl --without-vbox --without-lxc --without-esx --without-hyperv --without-parallels --with-test --with-remote --with-libvirtd --with-init-script=systemd --without-bhyve --without-gnutls --without-polkit --without-firewalld --without-dtrace --without-numad --with-network --with-secrets --with-storage-dir --with-storage-fs --with-storage-lvm --without-storage-iscsi --without-storage-scsi --without-storage-mpath --without-storage-disk --with-storage-rbd --without-storage-sheepdog --without-storage-gluster --without-wireshark-dissector --with-python --prefix="$PREFIX"
+ GNULIB_SRCDIR=.gnulib \
+ ./autogen.sh \
+ --without-apparmor --with-attr --without-audit --without-avahi --with-blkid \
+ --without-capng --with-curl --with-dbus --with-fuse --without-glusterfs \
+ --without-hal --without-netcf --without-numactl --without-openwsman \
+ --with-pciaccess --without-readline --without-sanlock --without-sasl \
+ --without-selinux --without-ssh2 --with-systemd-daemon --with-udev \
+ --with-yajl --without-xen --with-qemu --without-uml --without-openvz \
+ --without-vmware --without-phyp --without-xenapi --without-libxl \
+ --without-vbox --without-lxc --without-esx --without-hyperv \
+ --without-parallels --with-test --with-remote --with-libvirtd \
+ --with-init-script=systemd --without-bhyve --without-gnutls --without-polkit \
+ --without-firewalld --without-dtrace --without-numad --with-network \
+ --with-secrets --with-storage-dir --with-storage-fs --with-storage-lvm \
+ --without-storage-iscsi --without-storage-scsi --without-storage-mpath \
+ --without-storage-disk --with-storage-rbd --without-storage-sheepdog \
+ --without-storage-gluster --without-wireshark-dissector \
+ --prefix="$PREFIX"
+system-integration:
+ libvirt-misc:
+ 01-addgroup:
+ - groupadd libvirt
+ 02-setup_libvirtconf:
+ - sed -i 's/#unix_sock_group = "libvirt"/unix_sock_group = "libvirt"/' /etc/libvirt/libvirtd.conf
+ - sed -i 's/#unix_sock_rw_perms = "0770"/unix_sock_rw_perms = "0770"/' /etc/libvirt/libvirtd.conf
+ - sed -i 's/#unix_sock_ro_perms = "0777"/unix_sock_ro_perms = "0777"/' /etc/libvirt/libvirtd.conf
diff --git a/strata/virtualization/openvswitch.morph b/strata/virtualization/openvswitch.morph
new file mode 100644
index 00000000..1b5cdd86
--- /dev/null
+++ b/strata/virtualization/openvswitch.morph
@@ -0,0 +1,11 @@
+name: openvswitch
+kind: chunk
+build-system: manual
+pre-configure-commands:
+- ./boot.sh
+configure-commands:
+- ./configure --enable-ssl
+build-commands:
+- make
+install-commands:
+- make install DESTDIR="$DESTDIR" prefix="$PREFIX"