diff --git a/README.md b/README.md index 4b758a3..1905810 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,22 @@ Radar Third Party CI Dashboard for OpenStack ===================== -* Application Installation +* Radar API Installation * apt-get install libpq-dev libmysqlclient-dev * apt-get install mysql-server * apt-get install rabbitmq-server * pip install --upgrade -r requirements.txt * python setup.py build * python setup.py install + +* Nodejs setup + * curl -sL https://deb.nodesource.com/setup | sudo bash - + * apt-get install -y nodejs + * npm install -g grunt-cli + * npm install -g bower + * npm install + * bower install + * grunt * Database * CREATE user 'radar'@'localhost' IDENTIFIED BY 'radar'; @@ -15,8 +24,9 @@ Radar Third Party CI Dashboard for OpenStack * FLUSH PRIVILEGES; * radar-db-manage upgrade head -* API - * radar-api +* To run the: + * API + * radar-api -* Update Daemon - * radar-update-daemon \ No newline at end of file + * Update Daemon + * radar-update-daemon diff --git a/radar/api/app.wsgi.py b/radar/api/app.wsgi.py new file mode 100644 index 0000000..4bc5788 --- /dev/null +++ b/radar/api/app.wsgi.py @@ -0,0 +1,8 @@ +from radar.api import app +from oslo.config import cfg + +CONF = cfg.CONF + +CONF(project='radar') + +application = app.setup_app() diff --git a/radar/api/v1/wmodels.py b/radar/api/v1/wmodels.py index 642fb38..1f37c03 100644 --- a/radar/api/v1/wmodels.py +++ b/radar/api/v1/wmodels.py @@ -1,6 +1,6 @@ from datetime import datetime from wsme import types as wtypes -from api.v1 import base +from radar.api.v1 import base class System(base.APIBase): """Represents the ci systems for the dashboard @@ -33,7 +33,6 @@ class User(base.APIBase): email = wtypes.text """Email Address.""" - # Todo(nkonovalov): use teams to define superusers is_superuser = bool last_login = datetime diff --git a/radar/worker/task/process_update.py b/radar/worker/task/process_update.py index e51988a..5dad303 100644 --- a/radar/worker/task/process_update.py +++ b/radar/worker/task/process_update.py @@ -145,7 +145,7 @@ class ProcessCISystems(): print "operator %s was updated successfully" % theoperator['operator_name'] def _request_json(self, path, params, headers=None, method="post", - status=None, path_prefix="http://10.211.55.29:8080/v1"): + status=None, path_prefix="http://localhost/v1"): merged_headers = self.default_headers.copy() if headers: diff --git a/setup.cfg b/setup.cfg index e965408..daa3988 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,7 +2,7 @@ name = radar summary = OpenStack Third Party Dashboard description-file = - README.rst + README.md author = OpenStack author-email = openstack-dev@lists.openstack.org home-page = http://www.openstack.org/ diff --git a/webclient/src/theme/fonts/fontawesome-webfont.eot b/webclient/src/theme/fonts/fontawesome-webfont.eot new file mode 100644 index 0000000..84677bc Binary files /dev/null and b/webclient/src/theme/fonts/fontawesome-webfont.eot differ diff --git a/webclient/src/theme/fonts/fontawesome-webfont.ttf b/webclient/src/theme/fonts/fontawesome-webfont.ttf new file mode 100644 index 0000000..96a3639 Binary files /dev/null and b/webclient/src/theme/fonts/fontawesome-webfont.ttf differ diff --git a/webclient/src/theme/fonts/fontawesome-webfont.woff b/webclient/src/theme/fonts/fontawesome-webfont.woff new file mode 100644 index 0000000..628b6a5 Binary files /dev/null and b/webclient/src/theme/fonts/fontawesome-webfont.woff differ diff --git a/webclient/src/theme/fonts/glyphicons-halflings-regular.eot b/webclient/src/theme/fonts/glyphicons-halflings-regular.eot new file mode 100644 index 0000000..4a4ca86 Binary files /dev/null and b/webclient/src/theme/fonts/glyphicons-halflings-regular.eot differ diff --git a/webclient/src/theme/fonts/glyphicons-halflings-regular.ttf b/webclient/src/theme/fonts/glyphicons-halflings-regular.ttf new file mode 100644 index 0000000..67fa00b Binary files /dev/null and b/webclient/src/theme/fonts/glyphicons-halflings-regular.ttf differ diff --git a/webclient/src/theme/fonts/glyphicons-halflings-regular.woff b/webclient/src/theme/fonts/glyphicons-halflings-regular.woff new file mode 100644 index 0000000..8c54182 Binary files /dev/null and b/webclient/src/theme/fonts/glyphicons-halflings-regular.woff differ