diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-12 11:09:13 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-12 11:09:13 -0500 |
| commit | f9233a52cd65a1f15d9603ffaa0bebc15c386184 (patch) | |
| tree | c867d4ce47441eb133986d4e7a4b09def9051a04 /roles/nuage_node | |
| parent | 77ca4cdafdda5df48467b85d5ae1469c36d0fff4 (diff) | |
| parent | 3535ab6d8da1a1ac91dff47b6e92f625df102e2a (diff) | |
| download | openshift-f9233a52cd65a1f15d9603ffaa0bebc15c386184.tar.gz openshift-f9233a52cd65a1f15d9603ffaa0bebc15c386184.tar.bz2 openshift-f9233a52cd65a1f15d9603ffaa0bebc15c386184.tar.xz openshift-f9233a52cd65a1f15d9603ffaa0bebc15c386184.zip | |
Merge pull request #1390 from vishpat/nuage_parameter_changes
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" |