summaryrefslogtreecommitdiffstats
path: root/roles/nuage_common
diff options
context:
space:
mode:
authorRohan Parulekar <rohan.s.parulekar@nuagenetworks.net>2017-08-03 08:52:13 -0700
committerRohan Parulekar <rohan.s.parulekar@nuagenetworks.net>2017-08-24 08:18:31 -0700
commitb58adb0127b9fe5882b5902c6b865f534659811d (patch)
tree4aec6780150b9d8cdc62c9faccfa1a3eb011b076 /roles/nuage_common
parent41736f76f582214afd0c4132c0345094017a4749 (diff)
downloadopenshift-b58adb0127b9fe5882b5902c6b865f534659811d.tar.gz
openshift-b58adb0127b9fe5882b5902c6b865f534659811d.tar.bz2
openshift-b58adb0127b9fe5882b5902c6b865f534659811d.tar.xz
openshift-b58adb0127b9fe5882b5902c6b865f534659811d.zip
Nuage changes for Atomic hosts OSE Integration
Diffstat (limited to 'roles/nuage_common')
-rw-r--r--roles/nuage_common/defaults/main.yaml3
-rw-r--r--roles/nuage_common/tasks/main.yml27
2 files changed, 30 insertions, 0 deletions
diff --git a/roles/nuage_common/defaults/main.yaml b/roles/nuage_common/defaults/main.yaml
index a7803c0ee..919e3aa7b 100644
--- a/roles/nuage_common/defaults/main.yaml
+++ b/roles/nuage_common/defaults/main.yaml
@@ -10,5 +10,8 @@ nuage_ca_serial: "{{ nuage_ca_dir }}/nuageMonCA.serial.txt"
nuage_master_mon_dir: /usr/share/nuage-openshift-monitor
nuage_node_plugin_dir: /usr/share/vsp-openshift
+nuage_node_cni_bin_dir: /opt/cni/bin
+nuage_node_cni_netconf_dir: /etc/cni/net.d
+
nuage_mon_rest_server_port: "{{ nuage_openshift_monitor_rest_server_port | default('9443') }}"
nuage_mon_cert_validity_period: "{{ nuage_cert_validity_period | default('3650') }}"
diff --git a/roles/nuage_common/tasks/main.yml b/roles/nuage_common/tasks/main.yml
new file mode 100644
index 000000000..6c8c9f8d2
--- /dev/null
+++ b/roles/nuage_common/tasks/main.yml
@@ -0,0 +1,27 @@
+---
+- name: Set the Nuage plugin openshift directory fact to handle Atomic host install
+ set_fact:
+ nuage_node_plugin_dir: /var/usr/share/vsp-openshift
+ when: openshift.common.is_atomic | bool
+
+- name: Set the Nuage CNI network config directory fact to handle Atomic host install
+ set_fact:
+ nuage_node_cni_netconf_dir: /var/etc/cni/net.d/
+ when: openshift.common.is_atomic | bool
+
+- name: Set the Nuage CNI binary directory fact to handle Atomic host install
+ set_fact:
+ nuage_node_cni_bin_dir: /var/opt/cni/bin/
+ when: openshift.common.is_atomic | bool
+
+- name: Assure CNI plugin config dir exists before daemon set install
+ become: yes
+ file: path="{{ nuage_node_plugin_dir }}" state=directory
+
+- name: Assure CNI netconf directory exists before daemon set install
+ become: yes
+ file: path="{{ nuage_node_cni_netconf_dir }}" state=directory
+
+- name: Assure CNI plugin binary directory exists before daemon set install
+ become: yes
+ file: path="{{ nuage_node_cni_bin_dir }}" state=directory