Thay doi file nova

Thay doi file nova
Merge remote-tracking branch 'origin/master'

Conflicts:
	3-ice-aio-creatusetenant.sh