commit 74ba66dd3f3d54d6a2bec925e8c6573810976b5b
author Yuiko Takada <takada-yuiko@mxn.nes.nec.co.jp> Fri Dec 20 08:25:10 2013 +0000
committer Yuiko Takada <takada-yuiko@mxn.nes.nec.co.jp> Fri Dec 20 11:10:00 2013 +0000
tree c1e687bdc2a9ff50a866883744d6bf7c9d25a4cc
parent 03af3f180251e19eff2cdab317e3019d8af75e58

Fix the option of a2ensite command

devstack fails with trema when  execute
"sudo a2ensite sliceable_switch" command, without ".conf" filename extension
with Apache2.4, Apache2.22. With Apache 2.2, it successes.
Because in the versions which newer than version 2.2,
file checking of a2ensite command is more severe.
So, a2ensite command forbid "sliceable_switch" without "/conf".

Added ".conf" filename extension.

Change-Id: I29a03cb59ee493345b7df0f1a9189eb3516c86e2
Closes-Bug: #1263017

lib/neutron_thirdparty/trema

diff --git a/lib/neutron_thirdparty/trema b/lib/neutron_thirdparty/trema
index 9efd3f6..bdc2356 100644
--- a/lib/neutron_thirdparty/trema
+++ b/lib/neutron_thirdparty/trema
@@ -62,7 +62,7 @@
     sudo sed -i -e "s|/home/sliceable_switch/script|$TREMA_SS_SCRIPT_DIR|" \
         $TREMA_SS_APACHE_CONFIG
     sudo a2enmod rewrite actions
-    sudo a2ensite sliceable_switch
+    sudo a2ensite sliceable_switch.conf
 
     cp $TREMA_SS_DIR/sliceable_switch_null.conf $TREMA_SS_CONFIG
     sed -i -e "s|^\$apps_dir.*$|\$apps_dir = \"$TREMA_DIR/apps\"|" \