components/openstack/neutron/files/neutron-server
changeset 6848 8e252a37ed0d
parent 6031 1aaf20a19738
equal deleted inserted replaced
6847:57069587975f 6848:8e252a37ed0d
    13 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
    13 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
    14 #    License for the specific language governing permissions and limitations
    14 #    License for the specific language governing permissions and limitations
    15 #    under the License.
    15 #    under the License.
    16 
    16 
    17 import os
    17 import os
       
    18 from subprocess import CalledProcessError, check_call
    18 import sys
    19 import sys
    19 
    20 
    20 from openstack_common import is_ml2_plugin
       
    21 import smf_include
    21 import smf_include
    22 from subprocess import CalledProcessError, check_call
       
    23 
    22 
    24 
    23 
    25 def start():
    24 def start():
    26     cfg_files = sys.argv[2:3]
    25     cfg_files = sys.argv[2:3]
    27     if is_ml2_plugin():
    26     # It is ML2 plugin for now, until we introduce another plugin
    28         cfg_files.append("/etc/neutron/plugins/ml2/ml2_conf.ini")
    27     cfg_files.append("/etc/neutron/plugins/ml2/ml2_conf.ini")
    29     else:
       
    30         cfg_files.append("/etc/neutron/plugins/evs/evs_plugin.ini")
       
    31 
    28 
    32     # verify paths are valid
    29     # verify paths are valid
    33     for f in cfg_files:
    30     for f in cfg_files:
    34         if not os.path.exists(f) or not os.access(f, os.R_OK):
    31         if not os.path.exists(f) or not os.access(f, os.R_OK):
    35             print '%s does not exist or is not readable' % f
    32             print '%s does not exist or is not readable' % f