Browse code

Merge "Support for logging the nova-dhcpbridge command line"

Jenkins authored on 2016/01/17 06:37:02
Showing 1 changed files
... ...
@@ -478,7 +478,6 @@ function create_nova_conf {
478 478
     iniset $NOVA_CONF DEFAULT rootwrap_config "$NOVA_CONF_DIR/rootwrap.conf"
479 479
     iniset $NOVA_CONF DEFAULT scheduler_driver "$SCHEDULER"
480 480
     iniset $NOVA_CONF DEFAULT scheduler_default_filters "$FILTERS"
481
-    iniset $NOVA_CONF DEFAULT dhcpbridge_flagfile "$NOVA_CONF"
482 481
     iniset $NOVA_CONF DEFAULT force_dhcp_release "True"
483 482
     iniset $NOVA_CONF DEFAULT default_floating_pool "$PUBLIC_NETWORK_NAME"
484 483
     iniset $NOVA_CONF DEFAULT s3_host "$SERVICE_HOST"
... ...
@@ -633,6 +632,11 @@ function create_nova_conf {
633 633
         iniset $NOVA_CONF serial_console enabled True
634 634
     fi
635 635
     iniset $NOVA_CONF DEFAULT graceful_shutdown_timeout "$SERVICE_GRACEFUL_SHUTDOWN_TIMEOUT"
636
+
637
+    # Setup logging for nova-dhcpbridge command line
638
+    sudo cp "$NOVA_CONF" "$NOVA_CONF_DIR/nova-dhcpbridge.conf"
639
+    iniset "$NOVA_CONF_DIR/nova-dhcpbridge.conf" DEFAULT log_file "/opt/stack/logs/nova-dhcpbridge.log"
640
+    iniset $NOVA_CONF DEFAULT dhcpbridge_flagfile "$NOVA_CONF_DIR/nova-dhcpbridge.conf"
636 641
 }
637 642
 
638 643
 function init_nova_cells {