nova: Make configure_ceph_nova multinode compatible

Code Issues Proposed changes

This change stops configure_ceph_nova from creating the vms pool when
CEPH_REMOTE=true as this suggests that it has already been created by
the controller that has CEPH_REMOTE=false set.
Change-Id: Iaad67025a23bf29e29011c6e78662692af2b564a

This commit is contained in:

Lee Yarwood

2020年10月06日 15:12:26 +01:00

parent 5f38ad82ad

commit 6e6c81bc57

1 changed files with 8 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

10
devstack/lib/ceph

View File

@@ -822,8 +822,14 @@ function configure_ceph_embedded_nova {

# configure_ceph_nova() - Nova config needs to come after Nova is set up

function configure_ceph_nova {

sudo $DOCKER_EXEC ceph -c ${CEPH_CONF_FILE} osd pool create \

${NOVA_CEPH_POOL} ${NOVA_CEPH_POOL_PG} ${NOVA_CEPH_POOL_PGP}

# When REMOTE_CEPH=True is set on subnodes skip the creation of the nova

# pool as it has already been created on the controller that has

# REMOTE_CEPH=False.

if [[ "$REMOTE_CEPH" == "False" ]]; then

sudo $DOCKER_EXEC ceph -c ${CEPH_CONF_FILE} osd pool create \

${NOVA_CEPH_POOL} ${NOVA_CEPH_POOL_PG} ${NOVA_CEPH_POOL_PGP}

fi

iniset $NOVA_CONF libvirt rbd_user ${CINDER_CEPH_USER}

iniset $NOVA_CONF libvirt rbd_secret_uuid ${CINDER_CEPH_UUID}

nova: Make configure_ceph_nova multinode compatible

10 devstack/lib/ceph Unescape Escape View File

10
devstack/lib/ceph

View File