diff options
| author | Vishal Patil <vishal.patil@nuagenetworks.net> | 2016-02-11 10:05:29 -0500 |
|---|---|---|
| committer | Vishal Patil <vishal.patil@nuagenetworks.net> | 2016-02-11 10:05:29 -0500 |
| commit | 3535ab6d8da1a1ac91dff47b6e92f625df102e2a (patch) | |
| tree | faecbf5c8e84fcad9e28a2e3835ee03382e8f0bc /roles/nuage_node | |
| parent | 6b2edf68b223d8cba28fc96700651059c87a423a (diff) | |
| download | openshift-3535ab6d8da1a1ac91dff47b6e92f625df102e2a.tar.gz openshift-3535ab6d8da1a1ac91dff47b6e92f625df102e2a.tar.bz2 openshift-3535ab6d8da1a1ac91dff47b6e92f625df102e2a.tar.xz openshift-3535ab6d8da1a1ac91dff47b6e92f625df102e2a.zip | |
Changes for new Nuage RPMS
Diffstat (limited to 'roles/nuage_node')
| -rw-r--r-- | roles/nuage_node/tasks/main.yaml | 6 | ||||
| -rw-r--r-- | roles/nuage_node/templates/vsp-openshift.j2 (renamed from roles/nuage_node/templates/vsp-k8s.j2) | 0 | ||||
| -rw-r--r-- | roles/nuage_node/vars/main.yaml | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/roles/nuage_node/tasks/main.yaml b/roles/nuage_node/tasks/main.yaml index e0117bf71..c1e49902d 100644 --- a/roles/nuage_node/tasks/main.yaml +++ b/roles/nuage_node/tasks/main.yaml @@ -22,16 +22,16 @@ - name: Copy the certificates and keys sudo: true - copy: src="/tmp/{{ item }}" dest="{{ vsp_k8s_dir }}/{{ item }}" + copy: src="/tmp/{{ item }}" dest="{{ vsp_openshift_dir }}/{{ item }}" with_items: - ca.crt - nuage.crt - nuage.key - nuage.kubeconfig -- name: Set the vsp-k8s.yaml +- name: Set the vsp-openshift.yaml sudo: true - template: src=vsp-k8s.j2 dest={{ vsp_k8s_yaml }} owner=root mode=0644 + template: src=vsp-openshift.j2 dest={{ vsp_openshift_yaml }} owner=root mode=0644 notify: - restart vrs - restart node diff --git a/roles/nuage_node/templates/vsp-k8s.j2 b/roles/nuage_node/templates/vsp-openshift.j2 index 98d6c3a9c..98d6c3a9c 100644 --- a/roles/nuage_node/templates/vsp-k8s.j2 +++ b/roles/nuage_node/templates/vsp-openshift.j2 diff --git a/roles/nuage_node/vars/main.yaml b/roles/nuage_node/vars/main.yaml index a6b7cf997..4975d17ed 100644 --- a/roles/nuage_node/vars/main.yaml +++ b/roles/nuage_node/vars/main.yaml @@ -1,9 +1,9 @@ --- vrs_config: /etc/default/openvswitch -vsp_k8s_dir: /usr/share/vsp-k8s -vsp_k8s_yaml: "{{ vsp_k8s_dir }}/vsp-k8s.yaml" -client_cert: "{{ vsp_k8s_dir }}/nuage.crt" -client_key: "{{ vsp_k8s_dir }}/nuage.key" -ca_cert: "{{ vsp_k8s_dir }}/ca.crt" +vsp_openshift_dir: /usr/share/vsp-openshift +vsp_openshift_yaml: "{{ vsp_openshift_dir }}/vsp-openshift.yaml" +client_cert: "{{ vsp_openshift_dir }}/nuage.crt" +client_key: "{{ vsp_openshift_dir }}/nuage.key" +ca_cert: "{{ vsp_openshift_dir }}/ca.crt" api_server: "{{ openshift_node_master_api_url }}" docker_bridge: "docker0" |