summaryrefslogtreecommitdiffstats
path: root/windriver
diff options
context:
space:
mode:
Diffstat (limited to 'windriver')
-rw-r--r--windriver/run.sh2
-rw-r--r--windriver/stop.sh2
-rw-r--r--windriver/titanium_cloud/urls.py4
3 files changed, 4 insertions, 4 deletions
diff --git a/windriver/run.sh b/windriver/run.sh
index 74aff7fa..650c2c1b 100644
--- a/windriver/run.sh
+++ b/windriver/run.sh
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid
+memcached -d -m 2048 -c 1024 -p 11211 -P /tmp/memcached1.pid
export PYTHONPATH=lib/share
#nohup python manage.py runserver 0.0.0.0:9005 2>&1 &
diff --git a/windriver/stop.sh b/windriver/stop.sh
index ab8a72d5..5e7a6ac3 100644
--- a/windriver/stop.sh
+++ b/windriver/stop.sh
@@ -15,4 +15,4 @@
#ps auxww | grep 'manage.py runserver 0.0.0.0:9005' | awk '{print $2}' | xargs kill -9
ps auxww |grep 'uwsgi --http :9005 --module titanium_cloud.wsgi --master' |awk '{print $2}' |xargs kill -9
-ps auxww | grep 'memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid' | awk '{print $2}' | xargs kill -9
+ps auxww | grep 'memcached -d -m 2048 -c 1024 -p 11211 -P /tmp/memcached1.pid' | awk '{print $2}' | xargs kill -9
diff --git a/windriver/titanium_cloud/urls.py b/windriver/titanium_cloud/urls.py
index 4d118dc2..7a9f6455 100644
--- a/windriver/titanium_cloud/urls.py
+++ b/windriver/titanium_cloud/urls.py
@@ -83,7 +83,7 @@ urlpatterns = [
r'infra_workload/?$',
infra_workload.InfraWorkload.as_view()),
url(r'^api/multicloud-titaniumcloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/'
- r'infra_workload/(?P<workloadid>[0-9a-zA-Z_-]*)/?$',
+ r'infra_workload/(?P<workloadid>[0-9a-zA-Z_-]+)/?$',
infra_workload.InfraWorkload.as_view()),
url(r'^api/multicloud-titaniumcloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/',
include('titanium_cloud.proxy.urls')),
@@ -122,7 +122,7 @@ urlpatterns = [
infra_workload.APIv1InfraWorkload.as_view()),
url(r'^api/multicloud-titaniumcloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/'
r'(?P<cloud_region_id>[0-9a-zA-Z_-]+)/infra_workload/'
- r'(?P<workloadid>[0-9a-zA-Z_-]*)/?$',
+ r'(?P<workloadid>[0-9a-zA-Z_-]+)/?$',
infra_workload.APIv1InfraWorkload.as_view()),
url(r'^api/multicloud-titaniumcloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/'
r'(?P<cloud_region_id>[0-9a-zA-Z_-]+)/',