Skip to content

Commit d12083a

Browse files
committed
moved repo enable/disable into fatimage
1 parent 2ed6674 commit d12083a

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

ansible/bootstrap.yml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -110,25 +110,6 @@
110110
policy: "{{ selinux_policy }}"
111111
register: sestatus
112112

113-
- name: Sync pulp repos with upstream
114-
hosts: pulp
115-
tasks:
116-
- ansible.builtin.include_role:
117-
name: pulp_site
118-
tasks_from: sync.yml
119-
apply:
120-
delegate_to: localhost
121-
when: appliances_mode != 'configure' and appliances_sync_pulp_on_build
122-
123-
- hosts: dnf_repos
124-
become: yes
125-
tasks:
126-
- name: Replace system repos with pulp repos
127-
ansible.builtin.include_role:
128-
name: dnf_repos
129-
tasks_from: set_repos.yml
130-
when: appliances_mode != 'configure' and ansible_distribution_major_version == "9" #TODO update role once RL8 config decided
131-
132113
# --- tasks after here require access to package repos ---
133114
- hosts: squid
134115
tags: squid

ansible/fatimage.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,25 @@
1414
import_playbook: "{{ hook_path if hook_path | exists else 'noop.yml' }}"
1515
when: hook_path | exists
1616

17+
- name: Sync pulp repos with upstream
18+
hosts: pulp
19+
tasks:
20+
- ansible.builtin.include_role:
21+
name: pulp_site
22+
tasks_from: sync.yml
23+
apply:
24+
delegate_to: localhost
25+
when: appliances_mode != 'configure' and appliances_sync_pulp_on_build
26+
27+
- hosts: dnf_repos
28+
become: yes
29+
tasks:
30+
- name: Replace system repos with pulp repos
31+
ansible.builtin.include_role:
32+
name: dnf_repos
33+
tasks_from: set_repos.yml
34+
when: appliances_mode != 'configure' and ansible_distribution_major_version == "9" #TODO update role once RL8 config decided
35+
1736
- import_playbook: bootstrap.yml
1837

1938
- name: Run post-bootstrap.yml hook
@@ -199,6 +218,15 @@
199218
name: cloudalchemy.grafana
200219
tasks_from: install.yml
201220

221+
- hosts: dnf_repos
222+
become: yes
223+
tasks:
224+
- name: Disable pulp repos
225+
ansible.builtin.include_role:
226+
name: dnf_repos
227+
tasks_from: disable_repos.yml
228+
when: appliances_mode != 'configure' and ansible_distribution_major_version == "9" #TODO update role once RL8 config decided
229+
202230
- name: Run post.yml hook
203231
vars:
204232
appliances_environment_root: "{{ lookup('env', 'APPLIANCES_ENVIRONMENT_ROOT') }}"

ansible/site.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,6 @@
2828
- import_playbook: portal.yml
2929
- import_playbook: monitoring.yml
3030

31-
- hosts: dnf_repos
32-
become: yes
33-
tasks:
34-
- name: Disable pulp repos
35-
ansible.builtin.include_role:
36-
name: dnf_repos
37-
tasks_from: disable_repos.yml
38-
when: appliances_mode != 'configure' and ansible_distribution_major_version == "9" #TODO update role once RL8 config decided
39-
4031
- name: Run post.yml hook
4132
vars:
4233
# hostvars not available here, so have to recalculate environment root:

0 commit comments

Comments
 (0)