Rename pulpcore-content-app to pulpcore-content

re #4554 https://pulp.plan.io/issues/4554
pulp · Oct 3, 2019 · 42e08bb · 42e08bb
1 parent c69124a
commit 42e08bb
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/roles/pulp-content/README.md b/roles/pulp-content/README.md
@@ -8,7 +8,7 @@ Variables:
 
 * `pulp_content_bind`: Interface and Port where Pulp Content `gunicorn` service will listen.
 
-This variable is the value used to render the `pulpcore-content-app.service.j2` template passing
+This variable is the value used to render the `pulpcore-content.service.j2` template passing
 to the `--bind` parameter of the gunicorn service.
 
 Defaults to `127.0.0.1:24816`

diff --git a/roles/pulp-content/handlers/main.yml b/roles/pulp-content/handlers/main.yml
@@ -2,6 +2,6 @@
 - name: Reload systemd and restart pulp content app
   systemd:
     daemon_reload: true
-    name: pulpcore-content-app.service
+    name: pulpcore-content.service
     state: restarted
   become: true
diff --git a/roles/pulp-content/tasks/main.yml b/roles/pulp-content/tasks/main.yml
@@ -1,9 +1,9 @@
 ---
 - block:
-  - name: Install pulpcore-content-app service file
+  - name: Install pulpcore-content service file
     template:
-      src: pulpcore-content-app.service.j2
-      dest: /lib/systemd/system/pulpcore-content-app.service
+      src: pulpcore-content.service.j2
+      dest: /lib/systemd/system/pulpcore-content.service
       owner: root
       group: root
       mode: 0644
@@ -12,7 +12,7 @@
   - name: Set state of pulp content app
     systemd:
       daemon_reload: true
-      name: pulpcore-content-app.service
+      name: pulpcore-content.service
       state: started
       enabled: true
   become: true
diff --git a/...templates/pulpcore-content-app.service.j2 → ...ent/templates/pulpcore-content.service.j2 b/...templates/pulpcore-content-app.service.j2 → ...ent/templates/pulpcore-content.service.j2
@@ -7,8 +7,8 @@ Wants=network-online.target
 Environment="DJANGO_SETTINGS_MODULE=pulpcore.app.settings"
 Environment="PATH={{ pulp_install_dir }}/bin:{{ default_bin_path }}"
 User={{ pulp_user }}
-WorkingDirectory=/var/run/pulpcore-content-app/
-RuntimeDirectory=pulpcore-content-app
+WorkingDirectory=/var/run/pulpcore-content/
+RuntimeDirectory=pulpcore-content
 ExecStart={{ pulp_install_dir }}/bin/gunicorn pulpcore.content:server \
           --bind '{{ pulp_content_bind }}' \
           --worker-class 'aiohttp.GunicornWebWorker' \

diff --git a/roles/pulp-devel/files/settings.json b/roles/pulp-devel/files/settings.json
@@ -12,7 +12,7 @@
         "content": {
           "port": 24816,
           "scheme": "http",
-          "service": "pulpcore-content-app",
+          "service": "pulpcore-content",
           "verify": false
         },
         "pulp resource manager": {},

diff --git a/roles/pulp-devel/templates/alias.bashrc.j2 b/roles/pulp-devel/templates/alias.bashrc.j2
@@ -1,7 +1,7 @@
 # If adding new functions to this file, note that you can add help text to the function
 # by defining a variable with name _<function>_help containing the help text
 
-SERVICES=("pulpcore-content-app pulpcore-worker@1 pulpcore-worker@2 pulpcore-resource-manager pulpcore-api")
+SERVICES=("pulpcore-content pulpcore-worker@1 pulpcore-worker@2 pulpcore-resource-manager pulpcore-api")
 
 _paction() {
     echo systemctl $@ ${SERVICES}

diff --git a/roles/pulp-webserver/README.md b/roles/pulp-webserver/README.md
@@ -4,7 +4,7 @@ pulp-webserver
 Install, configure, start, and enable a web server.
 
 Currently, Nginx and Apache are supported. They are configured as a reverse proxy to the pulpcore-api
-and pulpcore-content-app Gunicorn processes.
+and pulpcore-content Gunicorn processes.
 
 
 Variables:

diff --git a/roles/pulp-webserver/templates/nginx.conf.j2 b/roles/pulp-webserver/templates/nginx.conf.j2
@@ -76,7 +76,7 @@ http {
             proxy_redirect off;
             proxy_pass http://pulp;
 
-            # This routes to both the pulpcore-content-app and the pulpcore-api
+            # This routes to both the pulpcore-content and the pulpcore-api
             # as if they are one service because both services allow for
             # plugin writers to configure arbitrary url handlers.
             proxy_next_upstream http_404;  # Try the other service upon 404