diff options
| author | Nick Bartos <flamingo@2thebatcave.com> | 2017-12-19 11:45:23 +1100 |
|---|---|---|
| committer | Nick Bartos <flamingo@2thebatcave.com> | 2018-01-08 07:44:35 +1100 |
| commit | a6860728cf634fdcba82db9dd5b2a2d82e93eaca (patch) | |
| tree | bfa095bf7b3da94936d703e3b1091efe986d24b8 /roles/contiv/templates | |
| parent | 6daf71565fd69e9ddb2ac20e787d49f74cf7a9d7 (diff) | |
| download | openshift-a6860728cf634fdcba82db9dd5b2a2d82e93eaca.tar.gz openshift-a6860728cf634fdcba82db9dd5b2a2d82e93eaca.tar.bz2 openshift-a6860728cf634fdcba82db9dd5b2a2d82e93eaca.tar.xz openshift-a6860728cf634fdcba82db9dd5b2a2d82e93eaca.zip | |
Use Contiv version 1.2.0
Diffstat (limited to 'roles/contiv/templates')
| -rw-r--r-- | roles/contiv/templates/api-proxy-daemonset.yml.j2 | 1 | ||||
| -rw-r--r-- | roles/contiv/templates/netmaster.env.j2 | 1 | ||||
| -rw-r--r-- | roles/contiv/templates/netmaster.j2 | 1 | ||||
| -rw-r--r-- | roles/contiv/templates/netplugin.j2 | 4 |
4 files changed, 4 insertions, 3 deletions
diff --git a/roles/contiv/templates/api-proxy-daemonset.yml.j2 b/roles/contiv/templates/api-proxy-daemonset.yml.j2 index 4d4388706..a15073580 100644 --- a/roles/contiv/templates/api-proxy-daemonset.yml.j2 +++ b/roles/contiv/templates/api-proxy-daemonset.yml.j2 @@ -42,6 +42,7 @@ spec: - --tls-key-file=/var/contiv/api_proxy_key.pem - --tls-certificate=/var/contiv/api_proxy_cert.pem - "--data-store-address={{ etcd_host }}" + - --data-store-driver=etcd - "--netmaster-address=127.0.0.1:{{ contiv_netmaster_port }}" ports: - containerPort: "{{ contiv_api_proxy_port }}" diff --git a/roles/contiv/templates/netmaster.env.j2 b/roles/contiv/templates/netmaster.env.j2 deleted file mode 100644 index 9a38f32ea..000000000 --- a/roles/contiv/templates/netmaster.env.j2 +++ /dev/null @@ -1 +0,0 @@ -NETMASTER_ARGS='--cluster-store {{ contiv_etcd_url }} --cluster-mode=kubernetes' diff --git a/roles/contiv/templates/netmaster.j2 b/roles/contiv/templates/netmaster.j2 new file mode 100644 index 000000000..c9db122b5 --- /dev/null +++ b/roles/contiv/templates/netmaster.j2 @@ -0,0 +1 @@ +NETMASTER_ARGS='--etcd={{ contiv_etcd_url }} --listen-url=127.0.0.1:{{ contiv_netmaster_port }} --fwdmode={{ contiv_netplugin_fwd_mode }} --infra={{ contiv_fabric_mode }} --control-url={{ contiv_netmaster_ctrl_ip }}:{{ contiv_netmaster_port }} --cluster-mode=kubernetes --netmode={{ contiv_encap_mode }}' diff --git a/roles/contiv/templates/netplugin.j2 b/roles/contiv/templates/netplugin.j2 index 9ce44e2dc..0fd727401 100644 --- a/roles/contiv/templates/netplugin.j2 +++ b/roles/contiv/templates/netplugin.j2 @@ -1,6 +1,6 @@ {% if contiv_encap_mode == "vlan" %} -NETPLUGIN_ARGS='-vlan-if {{ contiv_netplugin_interface }} -ctrl-ip {{ contiv_netplugin_ctrl_ip }} -plugin-mode kubernetes -cluster-store {{ contiv_etcd_url }}' +NETPLUGIN_ARGS='--vlan-if={{ contiv_netplugin_interface }} --ctrl-ip={{ contiv_netplugin_ctrl_ip }} --etcd={{ contiv_etcd_url }} --fwdmode={{ contiv_netplugin_fwd_mode }} --cluster-mode=kubernetes --netmode={{ contiv_encap_mode }}' {% endif %} {% if contiv_encap_mode == "vxlan" %} -NETPLUGIN_ARGS='-vtep-ip {{ contiv_netplugin_ctrl_ip }} -ctrl-ip {{ contiv_netplugin_ctrl_ip }} -plugin-mode kubernetes -cluster-store {{ contiv_etcd_url }}' +NETPLUGIN_ARGS='--vtep-ip={{ contiv_netplugin_ctrl_ip }} --vxlan-port={{ contiv_vxlan_port }} --ctrl-ip={{ contiv_netplugin_ctrl_ip }} --etcd={{ contiv_etcd_url }} --fwdmode={{ contiv_netplugin_fwd_mode }} --cluster-mode=kubernetes --netmode={{ contiv_encap_mode }}' {% endif %} |