summaryrefslogtreecommitdiffstats
path: root/roles/contiv/templates/contiv.cfg.j2
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-31 09:20:53 -0400
committerGitHub <noreply@github.com>2017-07-31 09:20:53 -0400
commit17f700a35653f549528507f3ce587be95311d61f (patch)
treebfdf8395fd451bd87fd56dbcaf868221bdbc5da1 /roles/contiv/templates/contiv.cfg.j2
parent3be2748d87f7eda17ed8cec496bbbd11b311b076 (diff)
parentb71f2782028ce7cf56614780a87faca31b9e42ac (diff)
downloadopenshift-17f700a35653f549528507f3ce587be95311d61f.tar.gz
openshift-17f700a35653f549528507f3ce587be95311d61f.tar.bz2
openshift-17f700a35653f549528507f3ce587be95311d61f.tar.xz
openshift-17f700a35653f549528507f3ce587be95311d61f.zip
Merge pull request #4919 from srampal/contiv_1.1.1
Some automation fixes for contiv GUI/auth_proxy & vxlan mode
Diffstat (limited to 'roles/contiv/templates/contiv.cfg.j2')
-rw-r--r--roles/contiv/templates/contiv.cfg.j23
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/contiv/templates/contiv.cfg.j2 b/roles/contiv/templates/contiv.cfg.j2
index 2c9a666a9..f0e99c556 100644
--- a/roles/contiv/templates/contiv.cfg.j2
+++ b/roles/contiv/templates/contiv.cfg.j2
@@ -2,5 +2,6 @@
"K8S_API_SERVER": "https://{{ hostvars[groups['masters'][0]]['ansible_' + netmaster_interface].ipv4.address }}:{{ kube_master_api_port }}",
"K8S_CA": "{{ openshift.common.config_base }}/node/ca.crt",
"K8S_KEY": "{{ openshift.common.config_base }}/node/system:node:{{ openshift.common.hostname }}.key",
- "K8S_CERT": "{{ openshift.common.config_base }}/node/system:node:{{ openshift.common.hostname }}.crt"
+ "K8S_CERT": "{{ openshift.common.config_base }}/node/system:node:{{ openshift.common.hostname }}.crt",
+ "SVC_SUBNET": "172.30.0.0/16"
}