From 6cb518c68eb136ad448e96716ef8b1348440949f Mon Sep 17 00:00:00 2001 From: Jonas Bjurel Date: Mon, 2 Mar 2015 22:46:45 +0100 Subject: Starting point for ODL Integration ***CAN BE MERGED*** - ODL build and installation (puppet manifests) including needed dependencies - Modified in accordance with Randy Levensalors comments - Added chmod 4755 /bin/fusermount due to that lately some systems dont install fuseiso withe SUID set for fusermount. Investing ongoing on why and why not consistent. - Rebased with master - ODL disabled in top Make (enable it by uncommenting the odl dirs - Removed white spaces - Hopefully fixed an issue with the docker ubuntu repos, added --no-cache=true to the fuel/docker/Make file. TODO: - Refactor collecting ODL and Java dependencies to one common place - Refactoring top Makefile - Adding CI hooks for build and deploy - Finishing integration plumbing wit Neutron/ML2 and OVS/OVSDB Change-Id: I13dd4d3a72d099316dfaa9f7cd9140781be2397b Signed-off-by: Jonas Bjurel --- fuel-build/docker/ubuntu-builder/enable_dockerx2 | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 fuel-build/docker/ubuntu-builder/enable_dockerx2 (limited to 'fuel-build/docker/ubuntu-builder/enable_dockerx2') diff --git a/fuel-build/docker/ubuntu-builder/enable_dockerx2 b/fuel-build/docker/ubuntu-builder/enable_dockerx2 deleted file mode 100644 index e79c8b7..0000000 --- a/fuel-build/docker/ubuntu-builder/enable_dockerx2 +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -# -# Needed to expose underlying cgroups to container -mount -n -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup -mount -t securityfs none /sys/kernel/security - -for mnt in $(cut -d: -f2 /proc/1/cgroup); do - mkdir /sys/fs/cgroup/$mnt - mount -n -t cgroup -o $mnt cgroup /sys/fs/cgroup/$mnt -done -- cgit 1.2.3-korg