diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-10-20 11:02:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-20 11:02:23 -0400 |
| commit | 94a75431044d6124dcb22659cbecbb09c3cb3a38 (patch) | |
| tree | 22f83883627f562e42e775f029a2415cafba60d9 /playbooks/common | |
| parent | 30d3fc6ed990c8e9f13b4e96e6e7acff13500e1e (diff) | |
| parent | e6ea6839a8f657c1266c25ba4aba43c837329fa3 (diff) | |
| download | openshift-94a75431044d6124dcb22659cbecbb09c3cb3a38.tar.gz openshift-94a75431044d6124dcb22659cbecbb09c3cb3a38.tar.bz2 openshift-94a75431044d6124dcb22659cbecbb09c3cb3a38.tar.xz openshift-94a75431044d6124dcb22659cbecbb09c3cb3a38.zip | |
Merge pull request #5574 from dulek/containerized_kuryr_support
Initial Kuryr support
Diffstat (limited to 'playbooks/common')
| -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 |