Browse code

Merge "Add neutron-metering agent and configuration"

Jenkins authored on 2016/06/15 09:59:27
Showing 1 changed files
... ...
@@ -240,6 +240,13 @@ function configure_neutron_new {
240 240
         iniset $NEUTRON_CONF DEFAULT ssl_key_file "$NEUTRON_SSL_KEY"
241 241
     fi
242 242
 
243
+    # Metering
244
+    if is_service_enabled neutron-metering; then
245
+        source $TOP_DIR/neutron_plugins/services/metering
246
+        neutron_agent_metering_configure_common
247
+        neutron_agent_metering_configure_agent
248
+    fi
249
+
243 250
 }
244 251
 
245 252
 # configure_neutron_rootwrap() - configure Neutron's rootwrap
... ...
@@ -426,6 +433,10 @@ function start_neutron_new {
426 426
     if is_service_enabled neutron-metadata-agent; then
427 427
         run_process neutron-metadata-agent "$NEUTRON_BIN_DIR/$NEUTRON_META_BINARY $NEUTRON_CONFIG_ARG"
428 428
     fi
429
+
430
+    if is_service_enabled neutron-metering; then
431
+        run_process neutron-metering "$AGENT_METERING_BINARY --config-file $NEUTRON_CONF --config-file $METERING_AGENT_CONF_FILENAME"
432
+    fi
429 433
 }
430 434
 
431 435
 # stop_neutron() - Stop running processes (non-screen)