From 2e33e567b1c9a8807d864e095ef88a9421b1bf0a Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Tue, 9 Apr 2019 17:08:12 -0400 Subject: [PATCH] Update docs for changed Pulp 3 Default Ports https://pulp.plan.io/issues/4594 Content: 8080 -> 24816 API: 8000 -> 24817 [noissue] Required PR: https://github.com/pulp/pulpcore/pull/75 --- docs/installation.rst | 6 +++--- docs/workflows/index.rst | 2 +- docs/workflows/publish.rst | 6 +++--- docs/workflows/sync.rst | 18 +++++++++--------- docs/workflows/upload.rst | 12 ++++++------ 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index fa1e34ef9..510d8a324 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -40,7 +40,7 @@ From Source source ~/pulpvenv/bin/activate cd pulp_deb pip install -e . - django-admin runserver + django-admin runserver 24817 Make and Run Migrations ----------------------- @@ -56,8 +56,8 @@ Run Services .. code-block:: bash - django-admin runserver - gunicorn pulpcore.content:server --bind 'localhost:8080' --worker-class 'aiohttp.GunicornWebWorker' -w 2 + django-admin runserver 24817 + gunicorn pulpcore.content:server --bind 'localhost:24816' --worker-class 'aiohttp.GunicornWebWorker' -w 2 sudo systemctl restart pulp-resource-manager sudo systemctl restart pulp-worker@1 sudo systemctl restart pulp-worker@2 diff --git a/docs/workflows/index.rst b/docs/workflows/index.rst index 17d4c8cb5..1ee1c2215 100644 --- a/docs/workflows/index.rst +++ b/docs/workflows/index.rst @@ -22,7 +22,7 @@ accordingly. If you prefer to specify the username and password with each reques To make these workflows copy/pastable, we make use of environment variables. The first variable to set is the hostname and port:: - $ export BASE_ADDR=http://:8000 + $ export BASE_ADDR=http://:24817 .. toctree:: diff --git a/docs/workflows/publish.rst b/docs/workflows/publish.rst index 029d5eeff..dfc348a96 100644 --- a/docs/workflows/publish.rst +++ b/docs/workflows/publish.rst @@ -15,7 +15,7 @@ $ http POST $BASE_ADDR/pulp/api/v3/publishers/deb/default/ name=bar Response:: { - "_href": "http://localhost:8000/pulp/api/v3/repositories/foo/publishers/deb/default/1/", + "_href": "http://localhost:24817/pulp/api/v3/repositories/foo/publishers/deb/default/1/", ... } @@ -35,7 +35,7 @@ Response:: [ { - "_href": "http://localhost:8000/pulp/api/v3/tasks/fd4cbecd-6c6a-4197-9cbe-4e45b0516309/", + "_href": "http://localhost:24817/pulp/api/v3/tasks/fd4cbecd-6c6a-4197-9cbe-4e45b0516309/", "task_id": "fd4cbecd-6c6a-4197-9cbe-4e45b0516309" } ] @@ -51,7 +51,7 @@ $ http POST $BASE_ADDR/pulp/api/v3/distributions/ name='baz' base_path='foo' pub Response:: { - "_href": "http://localhost:8000/pulp/api/v3/distributions/1/", + "_href": "http://localhost:24817/pulp/api/v3/distributions/1/", ... } diff --git a/docs/workflows/sync.rst b/docs/workflows/sync.rst index 35cb272f1..7fe8cb357 100644 --- a/docs/workflows/sync.rst +++ b/docs/workflows/sync.rst @@ -14,7 +14,7 @@ Start by creating a new repository named "foo":: Response:: { - "_href": "http://localhost:8000/pulp/api/v3/repositories/1/", + "_href": "http://localhost:24817/pulp/api/v3/repositories/1/", ... } @@ -29,7 +29,7 @@ Creating a remote object informs Pulp about an external content source. .. code:: json { - "_href": "http://localhost:8000/pulp/pulp/api/v3/remotes/deb/apt/1/", + "_href": "http://localhost:24817/pulp/pulp/api/v3/remotes/deb/apt/1/", ... } @@ -40,12 +40,12 @@ Sync repository foo with remote Use the remote object to kick off a synchronize task by specifying the repository to sync with. You are telling pulp to fetch content from the remote and add to the repository:: - $ http POST $BASE_ADDR/pulp/pulp/api/v3/remotes/deb/apt/1/sync/' repository=http://localhost:8000/pulp/api/v3/repositories/1/ + $ http POST $BASE_ADDR/pulp/pulp/api/v3/remotes/deb/apt/1/sync/' repository=http://localhost:24817/pulp/api/v3/repositories/1/ Response:: { - "_href": "http://localhost:8000/pulp/api/v3/tasks/3896447a-2799-4818-a3e5-df8552aeb903/", + "_href": "http://localhost:24817/pulp/api/v3/tasks/3896447a-2799-4818-a3e5-df8552aeb903/", "task_id": "3896447a-2799-4818-a3e5-df8552aeb903" } @@ -57,10 +57,10 @@ synchroinze task completes, it creates a new version, which is specified in ``cr Response:: { - "_href": "http://localhost:8000/pulp/api/v3/tasks/3896447a-2799-4818-a3e5-df8552aeb903/", + "_href": "http://localhost:24817/pulp/api/v3/tasks/3896447a-2799-4818-a3e5-df8552aeb903/", "_created": "2018-05-01T17:17:46.558997Z", "created_resources": [ - "http://localhost:8000/pulp/api/v3/repositories/593e2fa9-af64-4d4b-aa7b-7078c96f2443/versions/6/" + "http://localhost:24817/pulp/api/v3/repositories/593e2fa9-af64-4d4b-aa7b-7078c96f2443/versions/6/" ], "error": null, "finished_at": "2018-05-01T17:17:47.149123Z", @@ -72,7 +72,7 @@ Response:: "message": "Add Content", "state": "completed", "suffix": "", - "task": "http://localhost:8000/pulp/api/v3/tasks/3896447a-2799-4818-a3e5-df8552aeb903/", + "task": "http://localhost:24817/pulp/api/v3/tasks/3896447a-2799-4818-a3e5-df8552aeb903/", "total": 0 }, { @@ -80,12 +80,12 @@ Response:: "message": "Remove Content", "state": "completed", "suffix": "", - "task": "http://localhost:8000/pulp/api/v3/tasks/3896447a-2799-4818-a3e5-df8552aeb903/", + "task": "http://localhost:24817/pulp/api/v3/tasks/3896447a-2799-4818-a3e5-df8552aeb903/", "total": 0 } ], "spawned_tasks": [], "started_at": "2018-05-01T17:17:46.644801Z", "state": "completed", - "worker": "http://localhost:8000/pulp/api/v3/workers/eaffe1be-111a-421d-a127-0b8fa7077cf7/" + "worker": "http://localhost:24817/pulp/api/v3/workers/eaffe1be-111a-421d-a127-0b8fa7077cf7/" } diff --git a/docs/workflows/upload.rst b/docs/workflows/upload.rst index 7d8d1b105..23c0755b6 100644 --- a/docs/workflows/upload.rst +++ b/docs/workflows/upload.rst @@ -11,7 +11,7 @@ If you don't already have a repository, create one:: Response:: { - "_href": "http://localhost:8000/pulp/api/v3/repositories/1/", + "_href": "http://localhost:24817/pulp/api/v3/repositories/1/", ... } @@ -26,7 +26,7 @@ Each artifact in Pulp represents a file. They can be created during sync or crea Response:: { - "_href": "http://localhost:8000/pulp/api/v3/artifacts/1/", + "_href": "http://localhost:24817/pulp/api/v3/artifacts/1/", ... } @@ -36,13 +36,13 @@ Create content from an artifact Now that Pulp has the content, its time to make it into a unit of content. - $ http POST $BASE_ADDR/pulp/api/v3/content/deb/packages/ _artifact=http://localhost:8000/pulp/api/v3/artifacts/1/ filename=my_content + $ http POST $BASE_ADDR/pulp/api/v3/content/deb/packages/ _artifact=http://localhost:24817/pulp/api/v3/artifacts/1/ filename=my_content Response:: { - "_href": "http://localhost:8000/pulp/api/v3/content/deb/packages/1/", - "artifact": "http://localhost:8000/pulp/api/v3/artifacts/1/", + "_href": "http://localhost:24817/pulp/api/v3/content/deb/packages/1/", + "artifact": "http://localhost:24817/pulp/api/v3/artifacts/1/", "digest": "b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c", "filename": "my-content", "_type": "deb.packages" @@ -53,4 +53,4 @@ Add content to a repository Once there is a content unit, it can be added and removed and from to repositories:: -$ http POST $REPO_HREF/pulp/api/v3/repositories/1/versions/ add_content_units:="[\"http://localhost:8000/pulp/api/v3/content/deb/packages/1/\"]" +$ http POST $REPO_HREF/pulp/api/v3/repositories/1/versions/ add_content_units:="[\"http://localhost:24817/pulp/api/v3/content/deb/packages/1/\"]"