Skip to content
This repository has been archived by the owner on Jan 30, 2024. It is now read-only.

Commit

Permalink
Cleanup for PR commments
Browse files Browse the repository at this point in the history
closes #4302
  • Loading branch information
asmacdo committed Jan 24, 2019
1 parent 9b136ad commit 38b047d
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 24 deletions.
6 changes: 3 additions & 3 deletions roles/pulp3-content/README.md
Expand Up @@ -8,9 +8,9 @@ Shared variables:

* `ansible_python_interpreter`: **Required**. Path to the Python interpreter.

This role **is not tightly coupled** with the `pulp3-postgresql` role, but it does
use some of the same variables. When used together, the values are inherited from
the role. When not used together, these values are **required**.
This role **is not tightly coupled** with the `pulp3` role, but it does use some of the same
variables. When used together, the values are inherited from the role. When not used together,
these values are **required**.

* `pulp_user`
* `pulp_install_dir`
4 changes: 0 additions & 4 deletions roles/pulp3-content/defaults/main.yml

This file was deleted.

30 changes: 15 additions & 15 deletions roles/pulp3-content/tasks/main.yml
@@ -1,18 +1,18 @@
---
- name: Install pulp_content_app service file
template:
src: pulp_content_app.service.j2
dest: /lib/systemd/system/pulp_content_app.service
owner: root
group: root
mode: 0644
notify: Reload systemd and restart pulp content app
become: true
- block:
- name: Install pulp_content_app service file
template:
src: pulp_content_app.service.j2
dest: /lib/systemd/system/pulp_content_app.service
owner: root
group: root
mode: 0644
notify: Reload systemd and restart pulp content app

- name: Set state of pulp content app
systemd:
daemon_reload: true
name: pulp_content_app.service
state: started
enabled: true
- name: Set state of pulp content app
systemd:
daemon_reload: true
name: pulp_content_app.service
state: started
enabled: true
become: true
2 changes: 0 additions & 2 deletions roles/pulp3-content/templates/pulp_content_app.service.j2
Expand Up @@ -8,8 +8,6 @@ BindsTo=postgresql.service
After=postgresql.service

[Service]
EnvironmentFile=-/etc/default/pulp_workers
EnvironmentFile=-/etc/default/pulp_workers_%i
Environment="DJANGO_SETTINGS_MODULE=pulpcore.app.settings"
User={{ pulp_user }}
WorkingDirectory=/var/run/pulp_content_app/
Expand Down
1 change: 1 addition & 0 deletions user-sandbox.yml
Expand Up @@ -17,3 +17,4 @@
- pulp3-workers
- pulp3-resource-manager
- pulp3-webserver
- pulp3-content

0 comments on commit 38b047d

Please sign in to comment.