summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rwxr-xr-xci/02-deploybundle.sh2
-rw-r--r--ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml6
-rw-r--r--ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml8
-rw-r--r--ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml1
-rw-r--r--ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml4
5 files changed, 17 insertions, 4 deletions
diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index 647d18b0..b24b728a 100755
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -30,7 +30,7 @@ check_status() {
while [ $retval -eq 0 ]; do
sleep 30
juju status > status.txt
- if [ "$(grep -c "waiting" status.txt )" -ge 2 ]; then
+ if [ "$(grep -c "waiting" status.txt )" -ge 3 ]; then
echo " still waiting for machines ..."
if [ $timeoutiter -ge 240 ]; then
retval=1
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