summaryrefslogtreecommitdiffstats
path: root/roles/calico/templates/calico.service.j2
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-24 13:22:55 -0700
committerGitHub <noreply@github.com>2017-09-24 13:22:55 -0700
commitb42b714f505347eb937c15a5b72fadffae5d84e9 (patch)
tree36eeccef2555b2753fe8f4271007a053056d7bfd /roles/calico/templates/calico.service.j2
parent02485be8fe554e03bf07f0650f9ff36398679722 (diff)
parentfdc61b82abc9ee4ccd70b234951e6bfe14ee983f (diff)
downloadopenshift-b42b714f505347eb937c15a5b72fadffae5d84e9.tar.gz
openshift-b42b714f505347eb937c15a5b72fadffae5d84e9.tar.bz2
openshift-b42b714f505347eb937c15a5b72fadffae5d84e9.tar.xz
openshift-b42b714f505347eb937c15a5b72fadffae5d84e9.zip
Merge pull request #5493 from e-minguez/AnsibleUnsafeText_fix
Automatic merge from submit-queue Fixed AnsibleUnsafeText by converting to int Related to https://github.com/openshift/openshift-ansible/pull/5067 I've tested with custom values and it failed. This fixes the issue in my tests. ``` [cloud-user@bastion ~]$ grep -E 'osm|portal' /etc/ansible/hosts osm_default_node_selector="role=app" osm_use_cockpit=true osm_cluster_network_cidr=10.130.0.0/14 osm_host_subnet_length=8 openshift_portal_net=10.111.0.0/16 ``` After the installation: ``` [root@master-0 ~]# alias oetcdctl='etcdctl --cert-file=/etc/etcd/peer.crt --key-file=/etc/etcd/peer.key --ca-file=/etc/etcd/ca.crt --peers="https://master-0.edu.flannel.com:2379,https://master-1.edu.flannel.com:2379,https://master-2.edu.flannel.com:2379"' [root@master-0 ~]# oetcdctl get /openshift.com/network/config { "Network": "10.130.0.0/14", "SubnetLen": 24, "Backend": { "Type": "host-gw" } } ``` But, the subnets assigned to the nodes are on different subnet: ``` [root@master-0 ~]# oetcdctl ls /openshift.com/network/subnets /openshift.com/network/subnets/10.128.83.0-24 /openshift.com/network/subnets/10.128.18.0-24 /openshift.com/network/subnets/10.128.77.0-24 /openshift.com/network/subnets/10.128.101.0-24 /openshift.com/network/subnets/10.128.20.0-24 /openshift.com/network/subnets/10.128.92.0-24 /openshift.com/network/subnets/10.128.58.0-24 /openshift.com/network/subnets/10.128.48.0-24 ```
Diffstat (limited to 'roles/calico/templates/calico.service.j2')
0 files changed, 0 insertions, 0 deletions