diff options
author | Rohan Parulekar <rohan.s.parulekar@nuagenetworks.net> | 2017-08-30 10:41:53 -0700 |
---|---|---|
committer | Rohan Parulekar <rohan.s.parulekar@nuagenetworks.net> | 2017-09-20 11:14:01 -0700 |
commit | a468322fda65e49e0ef337d482945b6c5dd40270 (patch) | |
tree | bf068684c54b47b9279c06c375295e6ba95f033d /roles/nuage_master | |
parent | f28398ca6e44b03055a84223cb7b03c081b3a4ea (diff) | |
download | openshift-a468322fda65e49e0ef337d482945b6c5dd40270.tar.gz openshift-a468322fda65e49e0ef337d482945b6c5dd40270.tar.bz2 openshift-a468322fda65e49e0ef337d482945b6c5dd40270.tar.xz openshift-a468322fda65e49e0ef337d482945b6c5dd40270.zip |
Changes for Nuage atomic ansible install
Diffstat (limited to 'roles/nuage_master')
-rwxr-xr-x | roles/nuage_master/templates/nuage-master-config-daemonset.j2 | 6 | ||||
-rwxr-xr-x | roles/nuage_master/templates/nuage-node-config-daemonset.j2 | 15 |
2 files changed, 3 insertions, 18 deletions
diff --git a/roles/nuage_master/templates/nuage-master-config-daemonset.j2 b/roles/nuage_master/templates/nuage-master-config-daemonset.j2 index 612d689c2..7be5d6743 100755 --- a/roles/nuage_master/templates/nuage-master-config-daemonset.j2 +++ b/roles/nuage_master/templates/nuage-master-config-daemonset.j2 @@ -62,16 +62,14 @@ spec: selector: matchLabels: k8s-app: nuage-master-config + updateStrategy: + type: RollingUpdate template: metadata: labels: k8s-app: nuage-master-config spec: hostNetwork: true - tolerations: - - key: node-role.kubernetes.io/master - effect: NoSchedule - operator: Exists nodeSelector: install-monitor: "true" containers: diff --git a/roles/nuage_master/templates/nuage-node-config-daemonset.j2 b/roles/nuage_master/templates/nuage-node-config-daemonset.j2 index 02e9a1563..6a1267d94 100755 --- a/roles/nuage_master/templates/nuage-node-config-daemonset.j2 +++ b/roles/nuage_master/templates/nuage-node-config-daemonset.j2 @@ -23,7 +23,7 @@ data: # IP address and port number of master API server masterApiServer: {{ api_server_url }} # REST server URL - nuageMonRestServer: {{ nuage_mon_rest_server_url }} + nuageMonRestServer: https://{{ openshift_master_cluster_hostname }}:{{ nuage_mon_rest_server_port }} # Bridge name for the docker bridge dockerBridgeName: docker0 # Certificate for connecting to the openshift monitor REST api @@ -32,11 +32,6 @@ data: nuageMonClientKey: {{ nuage_node_config_dsets_mount_dir }}/vsp-openshift/nuageMonClient.key # CA certificate for verifying the master's rest server nuageMonServerCA: {{ nuage_node_config_dsets_mount_dir }}/vsp-openshift/nuageMonCA.crt - # Nuage vport mtu size - interfaceMTU: {{ nuage_vport_mtu }} - # Logging level for the plugin - # allowed options are: "dbg", "info", "warn", "err", "emer", "off" - logLevel: 3 # This will generate the required Nuage CNI yaml configuration cni_yaml_config: | @@ -72,10 +67,6 @@ spec: k8s-app: nuage-cni-ds spec: hostNetwork: true - tolerations: - - key: node-role.kubernetes.io/master - effect: NoSchedule - operator: Exists containers: # This container installs Nuage CNI binaries # and CNI network config file on each node. @@ -157,10 +148,6 @@ spec: k8s-app: nuage-vrs-ds spec: hostNetwork: true - tolerations: - - key: node-role.kubernetes.io/master - effect: NoSchedule - operator: Exists containers: # This container installs Nuage VRS running as a # container on each worker node |