Merge "[ceph]deploy mon nodes on controller nodes"

author Justin chi <chigang@huawei.com>

Fri, 6 Nov 2015 01:20:27 +0000 (01:20 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Fri, 6 Nov 2015 01:20:27 +0000 (01:20 +0000)
author Justin chi <chigang@huawei.com>
Fri, 6 Nov 2015 01:20:27 +0000 (01:20 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Fri, 6 Nov 2015 01:20:27 +0000 (01:20 +0000)
diff --cc deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml
Simple merge
diff --cc deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_RedHat.yml
Simple merge
author	Justin chi <chigang@huawei.com>
	Fri, 6 Nov 2015 01:20:27 +0000 (01:20 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Fri, 6 Nov 2015 01:20:27 +0000 (01:20 +0000)
		1	2
deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml	patch \|	diff1 \|	diff2 \|	blob \| history
deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_RedHat.yml	patch \|	diff1 \|	diff2 \|	blob \| history