@@ -46,7 +46,7 @@ Edit your ``local.conf`` to look like

     # Horizon

     ENABLED_SERVICES+=,horizon

     # Nova

-    ENABLED_SERVICES+=,n-api,n-crt,n-obj,n-cpu,n-cond,n-sch

+    ENABLED_SERVICES+=,n-api,n-crt,n-cpu,n-cond,n-sch

     # Glance

     ENABLED_SERVICES+=,g-api,g-reg

     # Neutron

@@ -20,7 +20,7 @@ ENABLED\_SERVICES

     ::

-        ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-cond,c-sch,c-api,c-vol,n-sch,n-cauth,horizon,rabbit,tempest,$DATABASE_TYPE

+        ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-cpu,n-net,n-cond,c-sch,c-api,c-vol,n-sch,n-cauth,horizon,rabbit,tempest,$DATABASE_TYPE

     Other services that are not enabled by default can be enabled in

     ``localrc``. For example, to add Swift, use the following service

@@ -450,7 +450,7 @@ function create_nova_accounts {

     fi

     # S3

-    if is_service_enabled n-obj swift3; then

+    if is_service_enabled swift3; then

         if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then

             get_or_create_service "s3" "s3" "S3"

@@ -869,11 +869,6 @@ function start_nova_rest {

     run_process n-cauth "$NOVA_BIN_DIR/nova-consoleauth --config-file $api_cell_conf"

     run_process n-sproxy "$NOVA_BIN_DIR/nova-serialproxy --config-file $api_cell_conf"

-    # Starting the nova-objectstore only if swift3 service is not enabled.

-    # Swift will act as s3 objectstore.

-    is_service_enabled swift3 || \

-        run_process n-obj "$NOVA_BIN_DIR/nova-objectstore --config-file $api_cell_conf"

-

     export PATH=$old_path

 }

@@ -907,7 +902,7 @@ function stop_nova_rest {

     # Kill the nova screen windows

     # Some services are listed here twice since more than one instance

     # of a service may be running in certain configs.

-    for serv in n-api n-crt n-net n-sch n-novnc n-xvnc n-cauth n-spice n-cond n-cell n-cell n-api-meta n-obj n-sproxy; do

+    for serv in n-api n-crt n-net n-sch n-novnc n-xvnc n-cauth n-spice n-cond n-cell n-cell n-api-meta n-sproxy; do

         stop_process $serv

     done

 }

@@ -86,10 +86,9 @@ LOGDAYS=2

 # Swift

 # -----

-# Swift is now used as the back-end for the S3-like object store. If Nova's

-# objectstore (``n-obj`` in ``ENABLED_SERVICES``) is enabled, it will NOT

-# run if Swift is enabled. Setting the hash value is required and you will

-# be prompted for it if Swift is enabled so just set it to something already:

+# Swift is now used as the back-end for the S3-like object store. Setting the

+# hash value is required and you will be prompted for it if Swift is enabled

+# so just set it to something already:

 SWIFT_HASH=66a3d6b56c1f479c8b4e70ab5c2000f5

 # For development purposes the default of 3 replicas is usually not required.