Merge "Add initial support for iperf3, both in client and server modes."

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..62e395f
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,34 @@
+#
+#   Copyright 2016 RIFT.io Inc
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+#
+
+BUILD_DIR = .
+
+CHARMS:= vpe-router vyos-proxy
+CHARM_SRC_DIR := layers
+CHARM_BUILD_DIR := $(BUILD_DIR)/builds
+
+CHARM_SRC_DIRS := $(addprefix $(CHARM_SRC_DIR)/, $(CHARMS))
+CHARM_BUILD_DIRS := $(addprefix $(CHARM_BUILD_DIR)/, $(CHARMS))
+
+all: $(CHARM_BUILD_DIRS)
+
+clean:
+       -@ $(RM) -rf $(CHARM_BUILD_DIR)
+
+$(CHARM_BUILD_DIR)/%: $(CHARM_SRC_DIR)/%
+       charm-build -o $(BUILD_DIR) $<
+

diff --git a/layers/vyos-proxy/layer.yaml b/layers/vyos-proxy/layer.yaml
index 16ac9ce..dd254f3 100644 (file)
--- a/layers/vyos-proxy/layer.yaml
+++ b/layers/vyos-proxy/layer.yaml
@@ -10,3 +10,4 @@
 "includes":
 - "layer:basic"
 "is": "vyos-proxy"
+"repo": "https://osm.etsi.org/gerrit/osm/juju-charms"