Merge "Fix wrong sudo ceph -c command in lib/ceph"

Jenkins · openstack-gerrit · commit 0884c25b1bac · 2015-05-10T22:28:36.000Z
diff --git a/lib/ceph b/lib/ceph
@@ -279,7 +279,7 @@ function configure_ceph_embedded_nova {
     # configure Nova service options, ceph pool, ceph user and ceph key
     sudo ceph -c ${CEPH_CONF_FILE} osd pool set ${NOVA_CEPH_POOL} size ${CEPH_REPLICAS}
     if [[ $CEPH_REPLICAS -ne 1 ]]; then
-        sudo -c ${CEPH_CONF_FILE} ceph osd pool set ${NOVA_CEPH_POOL} crush_ruleset ${RULE_ID}
+        sudo ceph -c ${CEPH_CONF_FILE} osd pool set ${NOVA_CEPH_POOL} crush_ruleset ${RULE_ID}
     fi
 }
 

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ function configure_ceph_embedded_nova {`
`279`	`279`	`# configure Nova service options, ceph pool, ceph user and ceph key`
`280`	`280`	`sudo ceph -c ${CEPH_CONF_FILE} osd pool set ${NOVA_CEPH_POOL} size ${CEPH_REPLICAS}`
`281`	`281`	`if [[ $CEPH_REPLICAS -ne 1 ]]; then`
`282`		`- sudo -c ${CEPH_CONF_FILE} ceph osd pool set ${NOVA_CEPH_POOL} crush_ruleset ${RULE_ID}`
	`282`	`+ sudo ceph -c ${CEPH_CONF_FILE} osd pool set ${NOVA_CEPH_POOL} crush_ruleset ${RULE_ID}`
`283`	`283`	`fi`
`284`	`284`	`}`
`285`	`285`