Skip to content

Commit f42322c

Browse files
committed
Nova_compute support bootc
Signed-off-by: Brendan Shephard <[email protected]>
1 parent 201b673 commit f42322c

File tree

2 files changed

+45
-22
lines changed

2 files changed

+45
-22
lines changed

roles/edpm_nova/handlers/main.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,20 @@
1919
state: restarted
2020
name: "edpm_nova_compute.service"
2121
listen: "Restart nova"
22+
when: not ansible_local.bootc
2223

2324
- name: Restart nova init container
2425
become: true
2526
containers.podman.podman_container:
2627
name: nova_compute_init
2728
state: started
2829
listen: "Restart nova init"
30+
when: not ansible_local.bootc
31+
32+
- name: Restart nova container
33+
become: true
34+
ansible.builtin.systemd:
35+
state: restarted
36+
name: edpm-compute@nova_compute
37+
listen: "Restart nova"
38+
when: ansible_local.bootc

roles/edpm_nova/tasks/install.yml

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,39 @@
3131
notify:
3232
- Restart nova init
3333

34-
- name: Deploy nova init container
35-
tags:
36-
- install
37-
- nova
38-
ansible.builtin.include_role:
39-
name: osp.edpm.edpm_container_manage
40-
vars:
41-
edpm_container_manage_config: '/var/lib/openstack/config/containers'
42-
edpm_container_manage_healthcheck_disabled: true
43-
edpm_container_manage_config_patterns: 'nova_compute_init.json'
44-
edpm_container_manage_clean_orphans: false
34+
- name: Deploy non-image mode Nova containers
35+
when: not ansible_local.bootc
36+
block:
37+
- name: Deploy nova init container
38+
tags:
39+
- install
40+
- nova
41+
ansible.builtin.include_role:
42+
name: osp.edpm.edpm_container_manage
43+
vars:
44+
edpm_container_manage_config: '/var/lib/openstack/config/containers'
45+
edpm_container_manage_healthcheck_disabled: true
46+
edpm_container_manage_config_patterns: 'nova_compute_init.json'
47+
edpm_container_manage_clean_orphans: false
48+
49+
- name: Deploy nova container
50+
tags:
51+
- install
52+
- nova
53+
ansible.builtin.include_role:
54+
name: osp.edpm.edpm_container_manage
55+
vars:
56+
edpm_container_manage_config: '/var/lib/openstack/config/containers'
57+
edpm_container_manage_healthcheck_disabled: true
58+
edpm_container_manage_config_patterns: 'nova_compute.json'
59+
edpm_container_manage_clean_orphans: false
60+
61+
- name: Deploy image mode Nova containers
62+
when: ansible_local.bootc
63+
block:
64+
- name: Deploy nova_compute container
65+
ansible.builtin.systemd_service:
66+
name: edpm-compute@nova_compute
67+
state: started
68+
enabled: true
4569

46-
- name: Deploy nova container
47-
tags:
48-
- install
49-
- nova
50-
ansible.builtin.include_role:
51-
name: osp.edpm.edpm_container_manage
52-
vars:
53-
edpm_container_manage_config: '/var/lib/openstack/config/containers'
54-
edpm_container_manage_healthcheck_disabled: true
55-
edpm_container_manage_config_patterns: 'nova_compute.json'
56-
edpm_container_manage_clean_orphans: false

0 commit comments

Comments
 (0)