@@ -44,8 +44,6 @@ PLACEMENT_UWSGI_CONF=$PLACEMENT_CONF_DIR/placement-uwsgi.ini

 # The placement service can optionally use a separate database

 # connection. Set PLACEMENT_DB_ENABLED to True to use it.

-# NOTE(cdent): This functionality depends on some code that is not

-# yet merged in nova but is coming soon.

 PLACEMENT_DB_ENABLED=$(trueorfalse False PLACEMENT_DB_ENABLED)

 if is_service_enabled tls-proxy; then

@@ -151,9 +149,9 @@ function create_placement_accounts {

 function init_placement {

     if [ "$PLACEMENT_DB_ENABLED" != False ]; then

         recreate_database placement

-        time_start "dbsync"

-        $NOVA_BIN_DIR/nova-manage --config-file $NOVA_CONF api_db sync

-        time_stop "dbsync"

+        # Database migration will be handled when nova does an api_db sync

+        # TODO(cdent): When placement is extracted we'll do our own sync

+        # here.

     fi

     create_placement_accounts

 }

@@ -894,6 +894,8 @@ if is_service_enabled neutron; then

     stack_install_service neutron

 fi

+# Nova configuration is used by placement so we need to create nova.conf

+# first.

 if is_service_enabled nova; then

     # Compute service

     stack_install_service nova

@@ -1184,6 +1186,13 @@ if is_service_enabled cinder; then

     init_cinder

 fi

+# Placement Service

+# ---------------

+

+if is_service_enabled placement; then

+    echo_summary "Configuring placement"

+    init_placement

+fi

 # Compute Service

 # ---------------

@@ -1202,11 +1211,6 @@ if is_service_enabled nova; then

     init_nova_cells

 fi

-if is_service_enabled placement; then

-    echo_summary "Configuring placement"

-    init_placement

-fi

-

 # Extras Configuration

 # ====================