shixiong/okd @ 800cbc36dc7fb3e7cea3057be284f7f55f1e6e88

David Critch 423bbf268a Merge branch 'master' into openstack-ssl-cert		6 rokov pred
..
azure.conf.j2	26f3988980 Create cloud config when using azure provider	7 rokov pred
openstack.conf.j2	3c69dc4e58 Adding support for an SSL certificate signed by the OpenStack cluster	7 rokov pred
vsphere.conf.j2	805c4a3d5b add template and vsphere.conf	7 rokov pred