Skip to content

Commit

Permalink
Problem: pulp-manager is not needed
Browse files Browse the repository at this point in the history
Solution: use django-admin directly

re: #4450
https://pulp.plan.io/issues/4450
  • Loading branch information
dkliban committed Mar 18, 2019
1 parent b92799c commit 2c07be4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .travis/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &
Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2c07be4

Please sign in to comment.