Skip to content

Commit ecbf19c

Browse files
committed
make plugins configurable
1 parent 998d84f commit ecbf19c

File tree

6 files changed

+16
-5
lines changed

6 files changed

+16
-5
lines changed

src/playbooks/deploy/deploy.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
candlepin_tomcat_certificate: "{{ localhost_certificate }}"
2323
candlepin_client_key: "{{ client_key }}"
2424
candlepin_client_certificate: "{{ client_certificate }}"
25+
foreman_plugins: "{{ plugins }}"
2526
foreman_ca_certificate: "{{ server_ca_certificate }}"
2627
foreman_client_key: "{{ client_key }}"
2728
foreman_client_certificate: "{{ client_certificate }}"

src/playbooks/deploy/metadata.obsah.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ variables:
4747
help: User of the Pulp database.
4848
pulp_database_password:
4949
help: Password for the Pulp database.
50+
plugins:
51+
parameter: --plugin
52+
help: Plugins to enable in this deployment.
53+
action: append
5054
constraints:
5155
required_together:
5256
- [database_ssl_mode, database_ssl_ca]

src/playbooks/setup-hammer/setup-hammer.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@
88
- "../../vars/{{ certificate_source }}_certificates.yml"
99
vars:
1010
hammer_ca_certificate: "{{ server_ca_certificate }}"
11+
hammer_plugins: "{{ plugins | map('replace', 'foreman-tasks', 'foreman_tasks') }}"
1112
roles:
1213
- hammer

src/roles/foreman/tasks/main.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
- 'foreman-client-key,type=mount,target=/etc/foreman/client_key.pem'
6363
env:
6464
SEED_ADMIN_PASSWORD: changeme
65+
FOREMAN_ENABLED_PLUGINS: "{{ foreman_plugins | join(' ') }}"
6566
quadlet_options:
6667
- |
6768
[Install]
@@ -87,6 +88,7 @@
8788
DYNFLOW_SIDEKIQ_SCRIPT: "/usr/share/foreman/extras/dynflow-sidekiq.rb"
8889
DYNFLOW_REDIS_URL: "redis://localhost:6379/6"
8990
REDIS_PROVIDER: "DYNFLOW_REDIS_URL"
91+
FOREMAN_ENABLED_PLUGINS: "{{ foreman_plugins | join(' ') }}"
9092
command: "/usr/libexec/foreman/sidekiq-selinux -e production -r /usr/share/foreman/extras/dynflow-sidekiq.rb -C /etc/foreman/dynflow/%i.yml"
9193
quadlet_options:
9294
- |

src/roles/hammer/defaults/main.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
---
22
hammer_foreman_server_url: "https://{{ ansible_fqdn }}"
33
hammer_ca_certificate: ""
4-
hammer_packages:
5-
- hammer-cli-plugin-foreman
6-
- hammer-cli-plugin-foreman_tasks
7-
- hammer-cli-plugin-foreman_remote_execution
8-
- hammer-cli-plugin-katello
4+
hammer_default_plugins:
5+
- foreman
6+
hammer_plugins: []
7+
hammer_packages: "{{ (hammer_default_plugins+hammer_plugins) | map('regex_replace', '^', 'hammer-cli-plugin-') }}"

src/vars/defaults.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
---
22
certificate_source: default
3+
plugins:
4+
- foreman-tasks
5+
- foreman_remote_execution
6+
- katello

0 commit comments

Comments
 (0)