diff options
| author |   AakashKT <aakash.kt@research.iiit.ac.in> | 2017-07-21 19:17:39 +0530 |
|---|---|---|
| committer | AakashKT <aakash.kt@research.iiit.ac.in> | 2017-07-21 19:19:50 +0530 |
| commit | bd5aef50f6c23101120172e1868fcdc189c30235 (patch) | |
| tree | 7f0185e1a8260a5d4d60bedc623b041edb42ffd1 /ci/config_tpl/juju2/bundlek8_tpl | |
| parent | 5cad009f23edb842327ed1a33034b72b22da3114 (diff) | |
Mofifications for OVN-Kubernetes
Change-Id: Ib1f24d4a11d5d0dd4a5356619757cc72ac800877
Signed-off-by: Aakash KT <aakash.kt@research.iiit.ac.in>
Diffstat (limited to 'ci/config_tpl/juju2/bundlek8_tpl')
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml | 6 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml | 8 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml | 1 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml | 4 |
4 files changed, 16 insertions, 3 deletions
diff --git a/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml b/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml index a4633fcb..ea46e424 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml @@ -6,5 +6,9 @@ "": internal-api {% endif %} to: - - "lxd:nodes/0" +{% if k8.network.controller == 'ovn' %} + - "nodes/1" +{% else %} + - "lxd:nodes/0" +{% endif %} diff --git a/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml b/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml index 5915038c..d902adf8 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml @@ -1,7 +1,11 @@ etcd: charm: "cs:~containers/etcd" {% if k8.feature.loadbalancer %} +{% if k8.network.controller == 'ovn' %} + num_units: 1 +{% else %} num_units: 3 +{% endif %} {% else %} num_units: 1 {% endif %} @@ -10,6 +14,9 @@ "": internal-api {% endif %} to: +{% if k8.network.controller == 'ovn' %} + - "nodes/0" +{% else %} {% if k8.feature.loadbalancer %} {% for unit_id in to_select() %} - "lxd:nodes/0" @@ -17,4 +24,5 @@ {% else %} - "lxd:nodes/0" {% endif %} +{% endif %} diff --git a/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml b/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml index 4589203c..933c1ef7 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml @@ -9,6 +9,7 @@ {% if k8.network.controller == 'ovn' %} options: channel: 1.5/stable + service-cidr: "192.168.200.0/24" {% endif %} to: - "nodes/0" diff --git a/ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml b/ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml index ac6e1cf2..094b3750 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml @@ -1,9 +1,9 @@ ovn: - charm: "cs:~aakashkt/ovn-2" + charm: "cs:~aakashkt/ovn-8" {% if os.service.bindings %} bindings: "": internal-api {% endif %} options: - gateway-physical-interface: "intf100"
\ No newline at end of file + gateway-physical-interface: "none"
\ No newline at end of file |