diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-30 23:16:14 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-30 23:16:14 -0800 |
commit | 2bdb52532bbbc678e240739fc42b7ea2ee71c876 (patch) | |
tree | 993907ccd72b22e0d19b2209f6ec8faef721c517 /roles/nuage_master/templates/nuage-node-config-daemonset.j2 | |
parent | 04894a4c43346417154a6c1591043236ed574d16 (diff) | |
parent | b637c993a2ace002c88004dbab663d7cfcf36327 (diff) | |
download | openshift-2bdb52532bbbc678e240739fc42b7ea2ee71c876.tar.gz openshift-2bdb52532bbbc678e240739fc42b7ea2ee71c876.tar.bz2 openshift-2bdb52532bbbc678e240739fc42b7ea2ee71c876.tar.xz openshift-2bdb52532bbbc678e240739fc42b7ea2ee71c876.zip |
Merge pull request #5651 from vareti/NuageEtcdCertsFix
Automatic merge from submit-queue.
copy etcd client certificates for nuage openshift monitor
Nuage OpenShift Monitor requires etcd client certificates to talk to etcd. This PR helps in copying the certificates to the node where monitor is running and configures the input parameters accordingly.
Diffstat (limited to 'roles/nuage_master/templates/nuage-node-config-daemonset.j2')
-rwxr-xr-x | roles/nuage_master/templates/nuage-node-config-daemonset.j2 | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/roles/nuage_master/templates/nuage-node-config-daemonset.j2 b/roles/nuage_master/templates/nuage-node-config-daemonset.j2 index 6a1267d94..996a2d2b0 100755 --- a/roles/nuage_master/templates/nuage-node-config-daemonset.j2 +++ b/roles/nuage_master/templates/nuage-node-config-daemonset.j2 @@ -61,6 +61,8 @@ spec: selector: matchLabels: k8s-app: nuage-cni-ds + updateStrategy: + type: RollingUpdate template: metadata: labels: @@ -104,6 +106,8 @@ spec: - mountPath: /var/log name: cni-log-dir - mountPath: {{ nuage_node_config_dsets_mount_dir }} + name: var-usr-share-dir + - mountPath: /usr/share/ name: usr-share-dir volumes: - name: cni-bin-dir @@ -121,9 +125,12 @@ spec: - name: cni-log-dir hostPath: path: /var/log - - name: usr-share-dir + - name: var-usr-share-dir hostPath: path: {{ nuage_node_config_dsets_mount_dir }} + - name: usr-share-dir + hostPath: + path: /usr/share/ --- @@ -164,7 +171,7 @@ spec: - name: NUAGE_PLATFORM value: '"kvm, k8s"' - name: NUAGE_K8S_SERVICE_IPV4_SUBNET - value: '192.168.0.0\/16' + value: '172.30.0.0\/16' - name: NUAGE_NETWORK_UPLINK_INTF value: "eth0" volumeMounts: |