diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-01 12:07:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-01 12:07:41 -0500 |
| commit | 1015166e2d7fe02a2f6a42cea53b1d64a119a80e (patch) | |
| tree | f46d19836de3f098e0ff809dc842b6a0c881516d /roles/nuage_node | |
| parent | d1e91e82e3cce236ba8fb07ed8c71f6016482562 (diff) | |
| parent | 51bf0a3d83d933b9a764365bad6e6dc48a9953ae (diff) | |
| download | openshift-1015166e2d7fe02a2f6a42cea53b1d64a119a80e.tar.gz openshift-1015166e2d7fe02a2f6a42cea53b1d64a119a80e.tar.bz2 openshift-1015166e2d7fe02a2f6a42cea53b1d64a119a80e.tar.xz openshift-1015166e2d7fe02a2f6a42cea53b1d64a119a80e.zip | |
Merge pull request #4015 from rparulek/copy-nuage-vsd-certs
Merged by openshift-bot
Diffstat (limited to 'roles/nuage_node')
| -rw-r--r-- | roles/nuage_node/tasks/main.yaml | 15 | ||||
| -rw-r--r-- | roles/nuage_node/templates/vsp-openshift.j2 | 2 | ||||
| -rw-r--r-- | roles/nuage_node/vars/main.yaml | 3 |
3 files changed, 20 insertions, 0 deletions
diff --git a/roles/nuage_node/tasks/main.yaml b/roles/nuage_node/tasks/main.yaml index d82dd36a4..928f9e2e6 100644 --- a/roles/nuage_node/tasks/main.yaml +++ b/roles/nuage_node/tasks/main.yaml @@ -20,6 +20,21 @@ become: yes yum: name={{ plugin_rpm }} state=present +- name: Assure CNI conf dir exists + become: yes + file: path="{{ cni_conf_dir }}" state=directory + +- name: Assures Openshift CNI bin dir exists + become: yes + file: path="{{ cni_bin_dir }}" state=directory + +- name: Install CNI loopback plugin + become: yes + copy: + src: "{{ k8s_cni_loopback_plugin }}" + dest: "{{ cni_bin_dir }}/{{ k8s_cni_loopback_plugin | basename }}" + mode: 0755 + - name: Copy the certificates and keys become: yes copy: src="/tmp/{{ item }}" dest="{{ vsp_openshift_dir }}/{{ item }}" diff --git a/roles/nuage_node/templates/vsp-openshift.j2 b/roles/nuage_node/templates/vsp-openshift.j2 index d3c0a122a..9fab53906 100644 --- a/roles/nuage_node/templates/vsp-openshift.j2 +++ b/roles/nuage_node/templates/vsp-openshift.j2 @@ -8,6 +8,8 @@ CACert: {{ ca_cert }} enterpriseName: {{ enterprise }} # Name of the domain in which pods will reside domainName: {{ domain }} +# Name of the VSD user in admin group +vsdUser: {{ vsduser }} # IP address and port number of master API server masterApiServer: {{ api_server }} # REST server URL diff --git a/roles/nuage_node/vars/main.yaml b/roles/nuage_node/vars/main.yaml index 7b789152f..4cf68411f 100644 --- a/roles/nuage_node/vars/main.yaml +++ b/roles/nuage_node/vars/main.yaml @@ -19,4 +19,7 @@ nuage_plugin_rest_client_crt_dir: "{{ nuage_ca_master_crt_dir }}/{{ ansible_node nuage_ca_master_plugin_key: "{{ nuage_plugin_rest_client_crt_dir }}/nuageMonClient.key" nuage_ca_master_plugin_crt: "{{ nuage_plugin_rest_client_crt_dir }}/nuageMonClient.crt" +cni_conf_dir: "/etc/cni/net.d/" +cni_bin_dir: "/opt/cni/bin/" + nuage_plugin_crt_dir: /usr/share/vsp-openshift |