Disable cinder on master temporarily for calico testing
Disable cinder on master temporarily for calico testing

Conflicts:
	hieradata/common/roles/master.yaml

eckhart/himlar,tanzr/himlar,eckhart/himlar,eckhart/himlar,raykrist/himlar,raykrist/himlar,norcams/himlar,mikaeld66/himlar,norcams/himlar,norcams/himlar,erlendbm/himlar,TorLdre/himlar,tanzr/himlar,mikaeld66/himlar,norcams/himlar,norcams/himlar,tanzr/himlar,raykrist/himlar,TorLdre/himlar,TorLdre/himlar,mikaeld66/himlar,erlendbm/himlar,tanzr/himlar,tanzr/himlar,raykrist/himlar,eckhart/himlar,TorLdre/himlar,mikaeld66/himlar,TorLdre/himlar,mikaeld66/himlar,raykrist/himlar