diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2019-10-04 15:15:47 -0400 |
|---|---|---|
| committer |   Parker Berberian <pberberian@iol.unh.edu> | 2019-10-08 14:39:30 -0400 |
| commit | 0a29cd3221d8d4085452e90569e2ed32a04e380d (patch) | |
| tree | ff3bd1bcbbf12661e0d5f5b9a42d48151df3e224 | |
| parent | e442e6630de110ff03ac7ceb4c1cf10c42c921cc (diff) | |
Rename pharos to laas
related to change:
https://gerrit.opnfv.org/gerrit/c/releng/+/68161
Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
Change-Id: I4985eb116fd2c214f3639eb991f27b5d75b5ab7c
Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
27 files changed, 46 insertions, 46 deletions
@@ -22,7 +22,7 @@ stop: docker-compose stop data: - docker volume create --name=pharos-data + docker volume create --name=laas-data shell-nginx: docker exec -ti ng01 bash diff --git a/docker-compose.override-dev.yml b/docker-compose.override-dev.yml index 0087c23..b9de639 100644 --- a/docker-compose.override-dev.yml +++ b/docker-compose.override-dev.yml @@ -10,12 +10,12 @@ version: '3' services: web: - image: opnfv/pharos-tools-laas-dashboard:dev + image: opnfv/laas-dashboard:dev build: context: . dockerfile: web/Dockerfile worker: - image: opnfv/pharos-tools-laas-celery:dev + image: opnfv/laas-celery:dev build: context: . dockerfile: worker/Dockerfile diff --git a/docker-compose.yml b/docker-compose.yml index eac84e6..ee8de2c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,13 +18,13 @@ services: - "80:80" volumes: - ./config/nginx:/etc/nginx/conf.d - - pharos-static:/static:ro - - pharos-media:/media + - laas-static:/static:ro + - laas-media:/media depends_on: - web web: - image: opnfv/pharos-tools-laas-dashboard:latest + image: opnfv/laas-dashboard:latest restart: always container_name: dg01 depends_on: @@ -33,8 +33,8 @@ services: - postgres env_file: config.env volumes: - - pharos-static:/static - - pharos-media:/media + - laas-static:/static + - laas-media:/media expose: - "8000" @@ -44,7 +44,7 @@ services: container_name: ps01 env_file: config.env volumes: - - pharos-data:/var/lib/postgresql/data + - laas-data:/var/lib/postgresql/data rabbitmq: restart: always @@ -55,14 +55,14 @@ services: - "5672:5672" worker: - image: opnfv/pharos-tools-laas-celery:latest + image: opnfv/laas-celery:latest restart: always env_file: config.env links: - postgres - rabbitmq volumes: - pharos-media: - pharos-static: - pharos-data: + laas-media: + laas-static: + laas-data: external: true @@ -10,7 +10,7 @@ The dashboard is deployed using docker-compose. -Application / database files are saved in the 'pharos-data' container +Application / database files are saved in the 'laas-data' container which needs to be pre-built before bringing up the dashboard. Deployment: diff --git a/src/account/urls.py b/src/account/urls.py index 8aad80c..47400e5 100644 --- a/src/account/urls.py +++ b/src/account/urls.py @@ -9,7 +9,7 @@ ############################################################################## -"""pharos_dashboard URL Configuration +"""laas_dashboard URL Configuration The `urlpatterns` list routes URLs to views. For more information please see: https://docs.djangoproject.com/en/1.10/topics/http/urls/ diff --git a/src/api/urls.py b/src/api/urls.py index b8b9cff..0e84a6a 100644 --- a/src/api/urls.py +++ b/src/api/urls.py @@ -9,7 +9,7 @@ ############################################################################## -"""pharos_dashboard URL Configuration +"""laas_dashboard URL Configuration The `urlpatterns` list routes URLs to views. For more information please see: https://docs.djangoproject.com/en/1.10/topics/http/urls/ diff --git a/src/booking/urls.py b/src/booking/urls.py index 310aaa7..54e29c9 100644 --- a/src/booking/urls.py +++ b/src/booking/urls.py @@ -9,7 +9,7 @@ ############################################################################## -"""pharos_dashboard URL Configuration +"""laas_dashboard URL Configuration The `urlpatterns` list routes URLs to views. For more information please see: https://docs.djangoproject.com/en/1.10/topics/http/urls/ diff --git a/src/dashboard/admin.py b/src/dashboard/admin.py index 43b5386..bd4d96c 100644 --- a/src/dashboard/admin.py +++ b/src/dashboard/admin.py @@ -12,5 +12,5 @@ from django.contrib import admin -admin.site.site_header = "Pharos Dashboard Administration" -admin.site.site_title = "Pharos Dashboard" +admin.site.site_header = "Laas Dashboard Administration" +admin.site.site_title = "Laas Dashboard" diff --git a/src/dashboard/populate_db_iol.py b/src/dashboard/populate_db_iol.py index 916dd97..57ebd40 100644 --- a/src/dashboard/populate_db_iol.py +++ b/src/dashboard/populate_db_iol.py @@ -262,7 +262,7 @@ class Populator: def get_lab_data(self, lab): data = {} - path = "/pharos_dashboard/data/" + lab.name + "/" + path = "/laas_dashboard/data/" + lab.name + "/" host_file = open(path + "hostlist.json") host_structure = json.loads(host_file.read()) host_file.close() diff --git a/src/dashboard/urls.py b/src/dashboard/urls.py index 571a987..60334f6 100644 --- a/src/dashboard/urls.py +++ b/src/dashboard/urls.py @@ -9,7 +9,7 @@ ############################################################################## -"""pharos_dashboard URL Configuration +"""laas_dashboard URL Configuration The `urlpatterns` list routes URLs to views. For more information please see: https://docs.djangoproject.com/en/1.10/topics/http/urls/ diff --git a/src/pharos_dashboard/__init__.py b/src/laas_dashboard/__init__.py index f104c4d..f104c4d 100644 --- a/src/pharos_dashboard/__init__.py +++ b/src/laas_dashboard/__init__.py diff --git a/src/pharos_dashboard/celery.py b/src/laas_dashboard/celery.py index 2a44a3d..65b9211 100644 --- a/src/pharos_dashboard/celery.py +++ b/src/laas_dashboard/celery.py @@ -13,11 +13,11 @@ import os from celery import Celery # set the default Django settings module for the 'celery' program. -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'pharos_dashboard.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'laas_dashboard.settings') from django.conf import settings # noqa -app = Celery('pharos_dashboard') +app = Celery('laas_dashboard') # Using a string here means the worker will not have to # pickle the object when using Windows. diff --git a/src/pharos_dashboard/settings.py b/src/laas_dashboard/settings.py index b44fed8..b73e2c8 100644 --- a/src/pharos_dashboard/settings.py +++ b/src/laas_dashboard/settings.py @@ -51,7 +51,7 @@ MIDDLEWARE = [ 'account.middleware.TimezoneMiddleware', ] -ROOT_URLCONF = 'pharos_dashboard.urls' +ROOT_URLCONF = 'laas_dashboard.urls' TEMPLATES = [ { @@ -74,7 +74,7 @@ TEMPLATE_CONTEXT_PROCESSORS = [ 'dashboard.context_processors.debug', ] -WSGI_APPLICATION = 'pharos_dashboard.wsgi.application' +WSGI_APPLICATION = 'laas_dashboard.wsgi.application' # Password validation # https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators diff --git a/src/pharos_dashboard/urls.py b/src/laas_dashboard/urls.py index fd791c3..f90f18b 100644 --- a/src/pharos_dashboard/urls.py +++ b/src/laas_dashboard/urls.py @@ -9,7 +9,7 @@ ############################################################################## -"""pharos_dashboard URL Configuration +"""laas_dashboard URL Configuration The `urlpatterns` list routes URLs to views. For more information please see: https://docs.djangoproject.com/en/1.10/topics/http/urls/ diff --git a/src/pharos_dashboard/wsgi.py b/src/laas_dashboard/wsgi.py index 3d43361..6858d3c 100644 --- a/src/pharos_dashboard/wsgi.py +++ b/src/laas_dashboard/wsgi.py @@ -9,7 +9,7 @@ """ -WSGI config for pharos_dashboard project. +WSGI config for laas_dashboard project. It exposes the WSGI callable as a module-level variable named ``application``. @@ -21,6 +21,6 @@ import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pharos_dashboard.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "laas_dashboard.settings") application = get_wsgi_application() diff --git a/src/manage.py b/src/manage.py index 3c7aba5..c412c6b 100755 --- a/src/manage.py +++ b/src/manage.py @@ -14,7 +14,7 @@ import os import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pharos_dashboard.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "laas_dashboard.settings") try: from django.core.management import execute_from_command_line except ImportError: diff --git a/src/notifier/manager.py b/src/notifier/manager.py index 240cf85..9b89ef5 100644 --- a/src/notifier/manager.py +++ b/src/notifier/manager.py @@ -93,7 +93,7 @@ class NotificationHandler(object): send_mail( "Your Booking is Ready", message, - os.environ.get("DEFAULT_FROM_EMAIL", "opnfv@pharos-dashboard"), + os.environ.get("DEFAULT_FROM_EMAIL", "opnfv@laas-dashboard"), [user.userprofile.email_addr], fail_silently=False ) @@ -117,7 +117,7 @@ class NotificationHandler(object): send_mail( "Your Booking has Expired", message, - os.environ.get("DEFAULT_FROM_EMAIL", "opnfv@pharos-dashboard"), + os.environ.get("DEFAULT_FROM_EMAIL", "opnfv@laas-dashboard"), user.userprofile.email_addr, fail_silently=False ) diff --git a/src/resource_inventory/pdf_templater.py b/src/resource_inventory/pdf_templater.py index 2302530..7e91b87 100644 --- a/src/resource_inventory/pdf_templater.py +++ b/src/resource_inventory/pdf_templater.py @@ -43,7 +43,7 @@ class PDFTemplater: lab = resource_lab.name location = resource_lab.location pod_type = "development" - link = "https://wiki.opnfv.org/display/INF/Pharos+Laas" + link = "https://wiki.opnfv.org/display/INF/Laas" try: # try to get more specific info that may fail, we dont care if it does diff --git a/src/resource_inventory/urls.py b/src/resource_inventory/urls.py index a72871b..a1eace7 100644 --- a/src/resource_inventory/urls.py +++ b/src/resource_inventory/urls.py @@ -9,7 +9,7 @@ ############################################################################## -"""pharos_dashboard URL Configuration +"""laas_dashboard URL Configuration The `urlpatterns` list routes URLs to views. For more information please see: https://docs.djangoproject.com/en/1.10/topics/http/urls/ diff --git a/src/static/bower.json b/src/static/bower.json index dda786d..c9c53e7 100644 --- a/src/static/bower.json +++ b/src/static/bower.json @@ -1,9 +1,9 @@ { - "name": "pharos-dashboard-dependencies", + "name": "laas-dashboard-dependencies", "authors": [ "maxbr <maxbr@mi.fu-berlin.de>" ], - "description": "This package contains all the Js/CSS dependencies needed to run the Pharos Dashboard.", + "description": "This package contains all the Js/CSS dependencies needed to run the Laas Dashboard.", "main": "", "license": "Apache2", "homepage": "", diff --git a/src/templates/base.html b/src/templates/base.html index f59740d..0b3f8c2 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -20,7 +20,7 @@ <img src="{% static "img/opnfv-logo.png" %}"> </a> <a class="navbar-brand d-none d-lg-inline" href={% url 'dashboard:index' %}> - Pharos Dashboard + Laas Dashboard </a> </div> <!-- Sidebar button --> diff --git a/src/templates/layout.html b/src/templates/layout.html index 205671b..eac0ac3 100644 --- a/src/templates/layout.html +++ b/src/templates/layout.html @@ -10,7 +10,7 @@ <meta name="description" content=""> <meta name="author" content=""> - <title>OPNFV Pharos {{ title }}</title> + <title>OPNFV Laas {{ title }}</title> <!-- Bootstrap Core CSS --> <link href="{% static "bower_components/bootstrap/dist/css/bootstrap.min.css" %}" diff --git a/src/templates/rest_framework/api.html b/src/templates/rest_framework/api.html index 9c6c4f7..a62c8f5 100644 --- a/src/templates/rest_framework/api.html +++ b/src/templates/rest_framework/api.html @@ -1,9 +1,9 @@ {% extends "rest_framework/base.html" %} -{% block title %}Pharos Dashboard API{% endblock %} +{% block title %}Laas Dashboard API{% endblock %} {% block branding %} <a class='navbar-brand' rel="nofollow" href=#> - Pharos Dashboard API + Laas Dashboard API </a> {% endblock %}
\ No newline at end of file diff --git a/web/Dockerfile b/web/Dockerfile index a153192..bdb9b41 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -19,8 +19,8 @@ ADD requirements.txt /requirements.txt RUN pip install -r /requirements.txt ADD web/init.sh /init.sh -ADD src/ /pharos_dashboard/ -COPY --from=static /static/ pharos_dashboard/static/ +ADD src/ /laas_dashboard/ +COPY --from=static /static/ laas_dashboard/static/ -WORKDIR /pharos_dashboard/ +WORKDIR /laas_dashboard/ CMD ["/init.sh"] diff --git a/web/init.sh b/web/init.sh index 736acc1..1545fc8 100755 --- a/web/init.sh +++ b/web/init.sh @@ -9,4 +9,4 @@ ############################################################################## python manage.py migrate && \ python manage.py collectstatic --no-input && \ -gunicorn pharos_dashboard.wsgi -b 0.0.0.0:8000 +gunicorn laas_dashboard.wsgi -b 0.0.0.0:8000 diff --git a/worker/Dockerfile b/worker/Dockerfile index cd0f797..5e24bed 100644 --- a/worker/Dockerfile +++ b/worker/Dockerfile @@ -13,10 +13,10 @@ ADD requirements.txt /requirements.txt RUN pip install -r /requirements.txt ADD worker/init.sh /init.sh -ADD src/ /pharos_dashboard/ +ADD src/ /laas_dashboard/ RUN useradd -ms /bin/bash celery USER celery -WORKDIR /pharos_dashboard/ +WORKDIR /laas_dashboard/ CMD ["/init.sh"] diff --git a/worker/init.sh b/worker/init.sh index ecec2a1..27cee33 100755 --- a/worker/init.sh +++ b/worker/init.sh @@ -7,4 +7,4 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -celery -A pharos_dashboard worker -l info -B --schedule=~/celerybeat-schedule +celery -A laas_dashboard worker -l info -B --schedule=~/celerybeat-schedule |