@@ -457,8 +457,6 @@ function create_nova_conf {

     iniset $NOVA_CONF DEFAULT scheduler_driver "$SCHEDULER"

     iniset $NOVA_CONF DEFAULT scheduler_default_filters "$FILTERS"

     iniset $NOVA_CONF DEFAULT default_floating_pool "$PUBLIC_NETWORK_NAME"

-    iniset $NOVA_CONF DEFAULT s3_host "$SERVICE_HOST"

-    iniset $NOVA_CONF DEFAULT s3_port "$S3_SERVICE_PORT"

     if [[ $SERVICE_IP_VERSION == 6 ]]; then

         iniset $NOVA_CONF DEFAULT my_ip "$HOST_IPV6"

         iniset $NOVA_CONF DEFAULT use_ipv6 "True"

@@ -468,7 +466,6 @@ function create_nova_conf {

     iniset $NOVA_CONF DEFAULT instance_name_template "${INSTANCE_NAME_PREFIX}%08x"

     iniset $NOVA_CONF DEFAULT osapi_compute_listen "$NOVA_SERVICE_LISTEN_ADDRESS"

     iniset $NOVA_CONF DEFAULT metadata_listen "$NOVA_SERVICE_LISTEN_ADDRESS"

-    iniset $NOVA_CONF DEFAULT s3_listen "$NOVA_SERVICE_LISTEN_ADDRESS"

     if is_fedora || is_suse; then

         # nova defaults to /usr/local/bin, but fedora and suse pip like to