文档更新
Merge branch 'master' of https://github.com/hello8817/openstack-icehouse-install-guide-gy

Conflicts:
	openstack安装文档.rst