shixiong/okd @ ff3f76bd8dcb0f3dcc8a1b51d15d610f478d0d0c

OpenShift Merge Robot fdc5829d6c Merge pull request #6607 from tomassedovic/fix-cinder-pv		пре 7 година
..
openstack.conf.j2	955a79c5c4 Add blockstorage version for openstack	пре 7 година
vsphere.conf.j2	805c4a3d5b add template and vsphere.conf	пре 7 година