diff options
| author | Michał Dulko <mdulko@redhat.com> | 2017-04-05 14:24:24 +0200 |
|---|---|---|
| committer | Michał Dulko <mdulko@redhat.com> | 2017-10-20 14:22:52 +0200 |
| commit | e6ea6839a8f657c1266c25ba4aba43c837329fa3 (patch) | |
| tree | abe66b2a635679b74b54f618c5b15e8ed793c6d1 /playbooks | |
| parent | 36d6b8ab6ee42a8a98321ae371398cf520ae8b71 (diff) | |
| download | openshift-e6ea6839a8f657c1266c25ba4aba43c837329fa3.tar.gz openshift-e6ea6839a8f657c1266c25ba4aba43c837329fa3.tar.bz2 openshift-e6ea6839a8f657c1266c25ba4aba43c837329fa3.tar.xz openshift-e6ea6839a8f657c1266c25ba4aba43c837329fa3.zip | |
Initial Kuryr support
This commit enables deploying Kuryr networking on top of OpenShift in
containers. kuryr-controller is a Deployment and kuryr-cni is deployed
as DaemonSet (container will drop all CNI configuration files).
Co-Authored-By: Antoni Segura Puimedon <celebdor@gmail.com>
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 6 | ||||
| -rw-r--r-- | playbooks/common/openshift-node/additional_config.yml | 14 |
2 files changed, 19 insertions, 1 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 6e57f282e..b359919ba 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -206,6 +206,12 @@ when: openshift_use_nuage | default(false) | bool - role: calico_master when: openshift_use_calico | default(false) | bool + tasks: + - include_role: + name: kuryr + tasks_from: master + when: openshift_use_kuryr | default(false) | bool + post_tasks: - name: Create group for deployment type group_by: key=oo_masters_deployment_type_{{ openshift.common.deployment_type }} diff --git a/playbooks/common/openshift-node/additional_config.yml b/playbooks/common/openshift-node/additional_config.yml index fe51ef833..ac757397b 100644 --- a/playbooks/common/openshift-node/additional_config.yml +++ b/playbooks/common/openshift-node/additional_config.yml @@ -19,10 +19,14 @@ - group_by: key: oo_nodes_use_{{ (openshift_use_contiv | default(False)) | ternary('contiv','nothing') }} changed_when: False + # Create group for kuryr nodes + - group_by: + key: oo_nodes_use_{{ (openshift_use_kuryr | default(False)) | ternary('kuryr','nothing') }} + changed_when: False - include: etcd_client_config.yml vars: - openshift_node_scale_up_group: "oo_nodes_use_flannel:oo_nodes_use_calico:oo_nodes_use_contiv" + openshift_node_scale_up_group: "oo_nodes_use_flannel:oo_nodes_use_calico:oo_nodes_use_contiv:oo_nodes_use_kuryr" - name: Additional node config hosts: oo_nodes_use_flannel @@ -50,3 +54,11 @@ - role: contiv contiv_role: netplugin when: openshift_use_contiv | default(false) | bool + +- name: Configure Kuryr node + hosts: oo_nodes_use_kuryr + tasks: + - include_role: + name: kuryr + tasks_from: node + when: openshift_use_kuryr | default(false) | bool |