diff options
| author | Sanjeev Rampal <srampal@cisco.com> | 2017-02-23 12:25:34 -0800 |
|---|---|---|
| committer | Sanjeev Rampal <srampal@cisco.com> | 2017-02-27 21:04:48 -0800 |
| commit | 58818a6af147e457d56a1faf77b02d37bb538826 (patch) | |
| tree | 6f9f4faaf19ae4fbac83979048aa327849609469 /playbooks | |
| parent | c7f83e208ee433da74b7eb26644b30684a69649b (diff) | |
| download | openshift-58818a6af147e457d56a1faf77b02d37bb538826.tar.gz openshift-58818a6af147e457d56a1faf77b02d37bb538826.tar.bz2 openshift-58818a6af147e457d56a1faf77b02d37bb538826.tar.xz openshift-58818a6af147e457d56a1faf77b02d37bb538826.zip | |
Combined (squashed) commit for all changes related to adding Contiv support into Openshift Ansible. This is the first (beta) release of Contiv with Openshift and is only supported for Openshift Origin + Bare metal deployments at the time of this commit. Please refer to the Openshift and Contiv official documentation for details of the level of support for different features and modes of operation.
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/adhoc/contiv/delete_contiv.yml | 29 | ||||
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 3 |
2 files changed, 32 insertions, 0 deletions
diff --git a/playbooks/adhoc/contiv/delete_contiv.yml b/playbooks/adhoc/contiv/delete_contiv.yml new file mode 100644 index 000000000..91948c72e --- /dev/null +++ b/playbooks/adhoc/contiv/delete_contiv.yml @@ -0,0 +1,29 @@ +--- +- name: delete contiv + hosts: all + gather_facts: False + tasks: + - systemd: + name: "{{ item }}" + state: stopped + with_items: + - contiv-etcd + - netmaster + - netplugin + - openvswitch + ignore_errors: True + - file: + path: "{{ item }}" + state: absent + with_items: + - /opt/cni + - /opt/contiv + - /etc/systemd/system/netmaster.service + - /etc/systemd/system/netplugin.service + - /etc/systemd/system/contiv-etcd.service + - /etc/systemd/system/contiv-etcd.service.d + - /var/lib/contiv-etcd + - /etc/default/netmaster + - /etc/default/netplugin + - /etc/openvswitch/conf.db + - command: systemctl daemon-reload diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml index 308a8959d..abeb93f97 100644 --- a/playbooks/common/openshift-node/config.yml +++ b/playbooks/common/openshift-node/config.yml @@ -95,6 +95,9 @@ when: openshift.common.use_flannel | bool - role: nuage_node when: openshift.common.use_nuage | bool + - role: contiv + contiv_role: netplugin + when: openshift.common.use_contiv | bool - role: nickhammond.logrotate - role: openshift_manage_node openshift_master_host: "{{ groups.oo_first_master.0 }}" |