summaryrefslogtreecommitdiffstats
path: root/roles/calico/templates/calicoctl.cfg.j2
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-12-20 15:59:23 -0800
committerGitHub <noreply@github.com>2017-12-20 15:59:23 -0800
commitcbcfd8a6d669e5b76afca79d3523bc537df804d3 (patch)
tree55a4432a8acec0b7d10bba5356bb93a88498e313 /roles/calico/templates/calicoctl.cfg.j2
parent898b43c24a0db0f53cd272de0f3dec2a32bbc34e (diff)
parent79db104b1780dbb3043a2878dd88a1fd3e91d52a (diff)
downloadopenshift-cbcfd8a6d669e5b76afca79d3523bc537df804d3.tar.gz
openshift-cbcfd8a6d669e5b76afca79d3523bc537df804d3.tar.bz2
openshift-cbcfd8a6d669e5b76afca79d3523bc537df804d3.tar.xz
openshift-cbcfd8a6d669e5b76afca79d3523bc537df804d3.zip
Merge pull request #6529 from smarterclayton/add_gcloud_to_image
Automatic merge from submit-queue. Add gcloud to the installer image The installer image will become our default cloud operations image for tasks that overlap with ansible, and will also be the image for provioning. We will eventually add others like awscli for support roles. Prereq for moving origin-gce into this repo @sdodson as discussed earlier (bypasses the need to get this in our tree for now)
Diffstat (limited to 'roles/calico/templates/calicoctl.cfg.j2')
0 files changed, 0 insertions, 0 deletions