From c3d7fe1a705f06e816b8ff1a6d4d395992753c9a Mon Sep 17 00:00:00 2001 From: Attila Fazekas Date: Tue, 8 Mar 2016 08:45:36 +0100 Subject: [PATCH] remove devstack/create_magnum_conf_magnum_network Looks like this function was not in use ever. It adds nova networking related options to the magnum.conf, which normally would belong to the nova.conf. Change-Id: I8435c674db17af2d0641afcf3cab140830130784 --- devstack/lib/magnum | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/devstack/lib/magnum b/devstack/lib/magnum index 94ae0a587c..6ee1144739 100644 --- a/devstack/lib/magnum +++ b/devstack/lib/magnum @@ -212,16 +212,6 @@ function update_heat_policy { sed -i 's/\("stacks:global_index":\).*$/\1 "role:admin",/' $HEAT_CONF_DIR/policy.json } -function create_magnum_conf_magnum_network { - iniset $MAGNUM_CONF DEFAULT network_manager "magnum.network.manager.$NETWORK_MANAGER" - iniset $MAGNUM_CONF DEFAULT public_interface "$PUBLIC_INTERFACE" - iniset $MAGNUM_CONF DEFAULT vlan_interface "$VLAN_INTERFACE" - iniset $MAGNUM_CONF DEFAULT flat_network_bridge "$FLAT_NETWORK_BRIDGE" - if [ -n "$FLAT_INTERFACE" ]; then - iniset $MAGNUM_CONF DEFAULT flat_interface "$FLAT_INTERFACE" - fi -} - # create_magnum_cache_dir() - Part of the init_magnum() process function create_magnum_cache_dir { # Create cache dir