From d7b0c8373866dabe55e1494dfd59de795ce531f4 Mon Sep 17 00:00:00 2001
From: "alberto.colla" <alberto.colla@garr.it>
Date: Mon, 25 Mar 2019 17:05:18 +0100
Subject: [PATCH] 2019-03-25 AC: added flannel charm for GPU server
---
bundle-noceph.yaml | 16 +++++++++++++++-
bundle.yaml | 16 +++++++++++++++-
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/bundle-noceph.yaml b/bundle-noceph.yaml
index 0811a44..6192a29 100644
--- a/bundle-noceph.yaml
+++ b/bundle-noceph.yaml
@@ -79,10 +79,23 @@ services:
# no bindings
options:
cidr: 10.111.0.0/16
+ iface: bond0.1202
annotations:
gui-x: '450'
gui-y: '750'
+ flannel-gpu:
+ charm: cs:~containers/flannel
+ # no bindings
+ options:
+ cidr: 10.111.0.0/16
+ iface: eno1.1202
+ annotations:
+ gui-x: '450'
+ gui-y: '750'
+
+
+
kubeapi-load-balancer:
charm: cs:~containers/kubeapi-load-balancer
bindings:
@@ -195,7 +208,8 @@ relations:
# - ["canal:cni", "kubernetes-worker-gpu:cni"]
# Flannel
- ["flannel:etcd", "etcd:db"]
+ - ["flannel-gpu:etcd", "etcd:db"]
- ["flannel:cni", "kubernetes-master:cni"]
- ["flannel:cni", "kubernetes-worker:cni"]
- - ["flannel:cni", "kubernetes-worker-gpu:cni"]
+ - ["flannel-gpu:cni", "kubernetes-worker-gpu:cni"]
diff --git a/bundle.yaml b/bundle.yaml
index 0811a44..6192a29 100644
--- a/bundle.yaml
+++ b/bundle.yaml
@@ -79,10 +79,23 @@ services:
# no bindings
options:
cidr: 10.111.0.0/16
+ iface: bond0.1202
annotations:
gui-x: '450'
gui-y: '750'
+ flannel-gpu:
+ charm: cs:~containers/flannel
+ # no bindings
+ options:
+ cidr: 10.111.0.0/16
+ iface: eno1.1202
+ annotations:
+ gui-x: '450'
+ gui-y: '750'
+
+
+
kubeapi-load-balancer:
charm: cs:~containers/kubeapi-load-balancer
bindings:
@@ -195,7 +208,8 @@ relations:
# - ["canal:cni", "kubernetes-worker-gpu:cni"]
# Flannel
- ["flannel:etcd", "etcd:db"]
+ - ["flannel-gpu:etcd", "etcd:db"]
- ["flannel:cni", "kubernetes-master:cni"]
- ["flannel:cni", "kubernetes-worker:cni"]
- - ["flannel:cni", "kubernetes-worker-gpu:cni"]
+ - ["flannel-gpu:cni", "kubernetes-worker-gpu:cni"]
--
GitLab