commit adcf0c50cd87c68abef7c3bb4785a07d3545be5d
author Jenkins <jenkins@review.openstack.org> Mon Jan 23 23:37:02 2017 +0000
committer Gerrit Code Review <review@openstack.org> Mon Jan 23 23:37:02 2017 +0000
tree acc86bc6625bd66d6cf74f2763451a59f6b09315
parent 7a1e6f042f00ac94ec30bb8c6bf5d05b34623832
parent fb1c7b51b57b11d263c8b08d4f12992fb58748cb

Merge "remove obsolete s3 conf from nova.conf"

lib/nova

diff --git a/lib/nova b/lib/nova
index 8cb003d..520eb67 100644
--- a/lib/nova
+++ b/lib/nova
@@ -457,8 +457,6 @@
     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 @@
     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