From 2c07be450e1ae373d7105fd36dac532844836870 Mon Sep 17 00:00:00 2001 From: Dennis Kliban Date: Sun, 17 Mar 2019 08:21:00 -0400 Subject: [PATCH] Problem: pulp-manager is not needed Solution: use django-admin directly re: #4450 https://pulp.plan.io/issues/4450 --- .travis/script.sh | 8 ++++---- README.rst | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis/script.sh b/.travis/script.sh index 5c376f1d6..3186bded6 100644 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -8,15 +8,15 @@ flake8 --config flake8.cfg || exit 1 # Run migrations. export DJANGO_SETTINGS_MODULE=pulpcore.app.settings export PULP_CONTENT_HOST=localhost:8080 -pulp-manager makemigrations docker -pulp-manager migrate --noinput +django-admin makemigrations docker +django-admin migrate --noinput # Run unit tests. (cd ../pulpcore && coverage run manage.py test pulp_docker.tests.unit) # Run functional tests. -pulp-manager reset-admin-password --password admin -pulp-manager runserver >> ~/django_runserver.log 2>&1 & +django-admin reset-admin-password --password admin +django-admin runserver >> ~/django_runserver.log 2>&1 & gunicorn pulpcore.content:server --bind 'localhost:8080' --worker-class 'aiohttp.GunicornWebWorker' -w 2 >> ~/content_app.log 2>&1 & rq worker -n 'resource-manager@%h' -w 'pulpcore.tasking.worker.PulpWorker' >> ~/resource_manager.log 2>&1 & rq worker -n 'reserved-resource-worker-1@%h' -w 'pulpcore.tasking.worker.PulpWorker' >> ~/reserved_worker-1.log 2>&1 & diff --git a/README.rst b/README.rst index 8fe668fbf..311381d0f 100644 --- a/README.rst +++ b/README.rst @@ -74,15 +74,15 @@ Make and Run Migrations .. code-block:: bash - pulp-manager makemigrations docker - pulp-manager migrate docker + django-admin makemigrations docker + django-admin migrate docker Run Services ------------ .. code-block:: bash - pulp-manager runserver + django-admin runserver gunicorn pulpcore.content:server --bind 'localhost:8080' --worker-class 'aiohttp.GunicornWebWorker' -w 2 sudo systemctl restart pulp-resource-manager sudo systemctl restart pulp-worker@1