Skip to content

Commit 7b22577

Browse files
dklibandkliban
authored
Merge pull request pulp#82 from mikedep333/default-ports
Change Pulp 3 Default Ports
2 parents ab383ff + dfba904 commit 7b22577

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

‎.travis/script.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ flake8 --config flake8.cfg
77

88
# Run migrations.
99
export DJANGO_SETTINGS_MODULE=pulpcore.app.settings
10-
export PULP_CONTENT_HOST=localhost:8080
10+
export PULP_CONTENT_HOST=localhost:24816
1111
django-admin makemigrations deb
1212
django-admin migrate --noinput
1313

@@ -16,8 +16,8 @@ django-admin migrate --noinput
1616

1717
# Run functional tests.
1818
django-admin reset-admin-password --password admin
19-
django-admin runserver >> ~/django_runserver.log 2>&1 &
20-
gunicorn pulpcore.content:server --bind 'localhost:8080' --worker-class 'aiohttp.GunicornWebWorker' -w 2 >> ~/content_app.log 2>&1 &
19+
django-admin runserver 24817 >> ~/django_runserver.log 2>&1 &
20+
gunicorn pulpcore.content:server --bind 'localhost:24816' --worker-class 'aiohttp.GunicornWebWorker' -w 2 >> ~/content_app.log 2>&1 &
2121
rq worker -n 'resource-manager@%h' -w 'pulpcore.tasking.worker.PulpWorker' >> ~/resource_manager.log 2>&1 &
2222
rq worker -n 'reserved-resource-worker-1@%h' -w 'pulpcore.tasking.worker.PulpWorker' >> ~/reserved_worker-1.log 2>&1 &
2323
sleep 8

‎docs/installation.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ From Source
4040
source ~/pulpvenv/bin/activate
4141
cd pulp_deb
4242
pip install -e .
43-
django-admin runserver
43+
django-admin runserver 24817
4444
4545
Make and Run Migrations
4646
-----------------------
@@ -56,8 +56,8 @@ Run Services
5656

5757
.. code-block:: bash
5858
59-
django-admin runserver
60-
gunicorn pulpcore.content:server --bind 'localhost:8080' --worker-class 'aiohttp.GunicornWebWorker' -w 2
59+
django-admin runserver 24817
60+
gunicorn pulpcore.content:server --bind 'localhost:24816' --worker-class 'aiohttp.GunicornWebWorker' -w 2
6161
sudo systemctl restart pulp-resource-manager
6262
sudo systemctl restart pulp-worker@1
6363
sudo systemctl restart pulp-worker@2

‎docs/workflows/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ accordingly. If you prefer to specify the username and password with each reques
2222
To make these workflows copy/pastable, we make use of environment variables. The first variable to
2323
set is the hostname and port::
2424

25-
$ export BASE_ADDR=http://<hostname>:8000
25+
$ export BASE_ADDR=http://<hostname>:24817
2626

2727

2828
.. toctree::

‎docs/workflows/publish.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $ http POST $BASE_ADDR/pulp/api/v3/publishers/deb/default/ name=bar
1515
Response::
1616

1717
{
18-
"_href": "http://localhost:8000/pulp/api/v3/repositories/foo/publishers/deb/default/1/",
18+
"_href": "http://localhost:24817/pulp/api/v3/repositories/foo/publishers/deb/default/1/",
1919
...
2020
}
2121

@@ -35,7 +35,7 @@ Response::
3535

3636
[
3737
{
38-
"_href": "http://localhost:8000/pulp/api/v3/tasks/fd4cbecd-6c6a-4197-9cbe-4e45b0516309/",
38+
"_href": "http://localhost:24817/pulp/api/v3/tasks/fd4cbecd-6c6a-4197-9cbe-4e45b0516309/",
3939
"task_id": "fd4cbecd-6c6a-4197-9cbe-4e45b0516309"
4040
}
4141
]
@@ -51,7 +51,7 @@ $ http POST $BASE_ADDR/pulp/api/v3/distributions/ name='baz' base_path='foo' pub
5151
Response::
5252

5353
{
54-
"_href": "http://localhost:8000/pulp/api/v3/distributions/1/",
54+
"_href": "http://localhost:24817/pulp/api/v3/distributions/1/",
5555
...
5656
}
5757

‎docs/workflows/sync.rst

+9-9
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Start by creating a new repository named "foo"::
1414
Response::
1515

1616
{
17-
"_href": "http://localhost:8000/pulp/api/v3/repositories/1/",
17+
"_href": "http://localhost:24817/pulp/api/v3/repositories/1/",
1818
...
1919
}
2020

@@ -29,7 +29,7 @@ Creating a remote object informs Pulp about an external content source.
2929
.. code:: json
3030
3131
{
32-
"_href": "http://localhost:8000/pulp/pulp/api/v3/remotes/deb/apt/1/",
32+
"_href": "http://localhost:24817/pulp/pulp/api/v3/remotes/deb/apt/1/",
3333
...
3434
}
3535
@@ -40,12 +40,12 @@ Sync repository foo with remote
4040
Use the remote object to kick off a synchronize task by specifying the repository to
4141
sync with. You are telling pulp to fetch content from the remote and add to the repository::
4242

43-
$ http POST $BASE_ADDR/pulp/pulp/api/v3/remotes/deb/apt/1/sync/' repository=http://localhost:8000/pulp/api/v3/repositories/1/
43+
$ http POST $BASE_ADDR/pulp/pulp/api/v3/remotes/deb/apt/1/sync/' repository=http://localhost:24817/pulp/api/v3/repositories/1/
4444

4545
Response::
4646

4747
{
48-
"_href": "http://localhost:8000/pulp/api/v3/tasks/3896447a-2799-4818-a3e5-df8552aeb903/",
48+
"_href": "http://localhost:24817/pulp/api/v3/tasks/3896447a-2799-4818-a3e5-df8552aeb903/",
4949
"task_id": "3896447a-2799-4818-a3e5-df8552aeb903"
5050
}
5151

@@ -57,10 +57,10 @@ synchroinze task completes, it creates a new version, which is specified in ``cr
5757
Response::
5858

5959
{
60-
"_href": "http://localhost:8000/pulp/api/v3/tasks/3896447a-2799-4818-a3e5-df8552aeb903/",
60+
"_href": "http://localhost:24817/pulp/api/v3/tasks/3896447a-2799-4818-a3e5-df8552aeb903/",
6161
"_created": "2018-05-01T17:17:46.558997Z",
6262
"created_resources": [
63-
"http://localhost:8000/pulp/api/v3/repositories/593e2fa9-af64-4d4b-aa7b-7078c96f2443/versions/6/"
63+
"http://localhost:24817/pulp/api/v3/repositories/593e2fa9-af64-4d4b-aa7b-7078c96f2443/versions/6/"
6464
],
6565
"error": null,
6666
"finished_at": "2018-05-01T17:17:47.149123Z",
@@ -72,20 +72,20 @@ Response::
7272
"message": "Add Content",
7373
"state": "completed",
7474
"suffix": "",
75-
"task": "http://localhost:8000/pulp/api/v3/tasks/3896447a-2799-4818-a3e5-df8552aeb903/",
75+
"task": "http://localhost:24817/pulp/api/v3/tasks/3896447a-2799-4818-a3e5-df8552aeb903/",
7676
"total": 0
7777
},
7878
{
7979
"done": 0,
8080
"message": "Remove Content",
8181
"state": "completed",
8282
"suffix": "",
83-
"task": "http://localhost:8000/pulp/api/v3/tasks/3896447a-2799-4818-a3e5-df8552aeb903/",
83+
"task": "http://localhost:24817/pulp/api/v3/tasks/3896447a-2799-4818-a3e5-df8552aeb903/",
8484
"total": 0
8585
}
8686
],
8787
"spawned_tasks": [],
8888
"started_at": "2018-05-01T17:17:46.644801Z",
8989
"state": "completed",
90-
"worker": "http://localhost:8000/pulp/api/v3/workers/eaffe1be-111a-421d-a127-0b8fa7077cf7/"
90+
"worker": "http://localhost:24817/pulp/api/v3/workers/eaffe1be-111a-421d-a127-0b8fa7077cf7/"
9191
}

‎docs/workflows/upload.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ If you don't already have a repository, create one::
1111
Response::
1212

1313
{
14-
"_href": "http://localhost:8000/pulp/api/v3/repositories/1/",
14+
"_href": "http://localhost:24817/pulp/api/v3/repositories/1/",
1515
...
1616
}
1717

@@ -26,7 +26,7 @@ Each artifact in Pulp represents a file. They can be created during sync or crea
2626
Response::
2727

2828
{
29-
"_href": "http://localhost:8000/pulp/api/v3/artifacts/1/",
29+
"_href": "http://localhost:24817/pulp/api/v3/artifacts/1/",
3030
...
3131
}
3232

@@ -36,13 +36,13 @@ Create content from an artifact
3636

3737
Now that Pulp has the content, its time to make it into a unit of content.
3838

39-
$ http POST $BASE_ADDR/pulp/api/v3/content/deb/packages/ _artifact=http://localhost:8000/pulp/api/v3/artifacts/1/ filename=my_content
39+
$ http POST $BASE_ADDR/pulp/api/v3/content/deb/packages/ _artifact=http://localhost:24817/pulp/api/v3/artifacts/1/ filename=my_content
4040

4141
Response::
4242

4343
{
44-
"_href": "http://localhost:8000/pulp/api/v3/content/deb/packages/1/",
45-
"artifact": "http://localhost:8000/pulp/api/v3/artifacts/1/",
44+
"_href": "http://localhost:24817/pulp/api/v3/content/deb/packages/1/",
45+
"artifact": "http://localhost:24817/pulp/api/v3/artifacts/1/",
4646
"digest": "b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c",
4747
"filename": "my-content",
4848
"_type": "deb.packages"
@@ -53,4 +53,4 @@ Add content to a repository
5353

5454
Once there is a content unit, it can be added and removed and from to repositories::
5555

56-
$ http POST $REPO_HREF/pulp/api/v3/repositories/1/versions/ add_content_units:="[\"http://localhost:8000/pulp/api/v3/content/deb/packages/1/\"]"
56+
$ http POST $REPO_HREF/pulp/api/v3/repositories/1/versions/ add_content_units:="[\"http://localhost:24817/pulp/api/v3/content/deb/packages/1/\"]"

0 commit comments

Comments
 (0)