diff options
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml | 7 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/flannel.yaml | 7 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml | 19 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml | 9 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/relations.yaml | 5 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/subordinate.yaml | 4 | ||||
| -rw-r--r-- | ci/default_deployment_config.yaml | 2 | ||||
| -rw-r--r-- | ci/genK8Bundle.py | 3 |
8 files changed, 51 insertions, 5 deletions
diff --git a/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml b/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml index 400dcb45..96a27cfb 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml @@ -15,11 +15,16 @@ {% include 'kubernetes.yaml' %} {% include 'easyrsa.yaml' %} {% include 'etcd.yaml' %} -{% include 'subordinate.yaml' %} {% if k8.feature.loadbalancer %} {% include 'kubeapi-load-balancer.yaml' %} {% endif %} +{% if k8.network.controller == 'ovn' %} +{% include 'ovn.yaml' %} +{% else %} +{% include 'flannel.yaml' %} +{% endif %} + relations: - [ 'ntp:juju-info', 'nodes:juju-info' ] diff --git a/ci/config_tpl/juju2/bundlek8_tpl/flannel.yaml b/ci/config_tpl/juju2/bundlek8_tpl/flannel.yaml new file mode 100644 index 00000000..561e0880 --- /dev/null +++ b/ci/config_tpl/juju2/bundlek8_tpl/flannel.yaml @@ -0,0 +1,7 @@ + + flannel: + charm: cs:~containers/flannel +{% if os.service.bindings %} + bindings: + "": internal-api +{% endif %}
\ No newline at end of file diff --git a/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml b/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml index 93f8890e..4589203c 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml @@ -2,13 +2,32 @@ charm: "cs:~containers/kubernetes-master" num_units: 1 expose: true +{% if os.service.bindings %} + bindings: + "": internal-api +{% endif %} +{% if k8.network.controller == 'ovn' %} + options: + channel: 1.5/stable +{% endif %} to: - "nodes/0" + + + kubernetes-worker: charm: "cs:~containers/kubernetes-worker" num_units: {{ opnfv.units - 1 }} expose: true +{% if os.service.bindings %} + bindings: + "": internal-api +{% endif %} +{% if k8.network.controller == 'ovn' %} + options: + channel: 1.5/stable +{% endif %} to: {% for unit_id in range(1, opnfv.units) %} - "nodes/{{ unit_id }}" diff --git a/ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml b/ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml new file mode 100644 index 00000000..ac6e1cf2 --- /dev/null +++ b/ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml @@ -0,0 +1,9 @@ + + ovn: + charm: "cs:~aakashkt/ovn-2" +{% if os.service.bindings %} + bindings: + "": internal-api +{% endif %} + options: + gateway-physical-interface: "intf100"
\ No newline at end of file diff --git a/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml b/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml index 3a34aa1e..44018201 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml @@ -7,9 +7,14 @@ - [ 'kubernetes-master:etcd', 'etcd:db' ] - [ 'kubernetes-master:kube-control', 'kubernetes-worker:kube-control' ] - [ 'kubernetes-worker:certificates', 'easyrsa:client' ] +{% if k8.network.controller == 'ovn' %} + - [ 'ovn:cni', 'kubernetes-master:cni' ] + - [ 'ovn:cni', 'kubernetes-worker:cni' ] +{% else %} - [ 'flannel:etcd', 'etcd:db' ] - [ 'flannel:cni', 'kubernetes-master:cni' ] - [ 'flannel:cni', 'kubernetes-worker:cni' ] +{% endif %} - [ 'etcd:certificates', 'easyrsa:client' ] {% if k8.feature.loadbalancer %} - [ 'kubernetes-master:loadbalancer', 'kubeapi-load-balancer:loadbalancer' ] diff --git a/ci/config_tpl/juju2/bundlek8_tpl/subordinate.yaml b/ci/config_tpl/juju2/bundlek8_tpl/subordinate.yaml deleted file mode 100644 index 30832c54..00000000 --- a/ci/config_tpl/juju2/bundlek8_tpl/subordinate.yaml +++ /dev/null @@ -1,4 +0,0 @@ - - flannel: - charm: cs:~containers/flannel - diff --git a/ci/default_deployment_config.yaml b/ci/default_deployment_config.yaml index 0285ebcc..9a068177 100644 --- a/ci/default_deployment_config.yaml +++ b/ci/default_deployment_config.yaml @@ -40,3 +40,5 @@ os: k8: feature: loadbalancer: False + network: + controller: nosdn diff --git a/ci/genK8Bundle.py b/ci/genK8Bundle.py index 81deb5c0..2f0b63d5 100644 --- a/ci/genK8Bundle.py +++ b/ci/genK8Bundle.py @@ -165,6 +165,9 @@ if 'dpdk' in features: if 'lb' in features: config['k8']['feature']['loadbalancer'] = True +# change ha mode +config['k8']['network']['controller'] = sdn + # Set beta option from extra if 'hugepages' in extra: config['os']['beta']['huge_pages'] = True |