Skip to content
Snippets Groups Projects
Commit df29551f authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review
Browse files

Merge "Disable nova-compute when enable_ironic is yes"

parents 225b1a1d f0c61d4b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ansible/roles/nova/defaults/main.yml
+ 1
− 1
View file @ df29551f
...@@ -112,7 +112,7 @@ nova_services: ...@@ -112,7 +112,7 @@ nova_services:
group: "compute" group: "compute"
image: "{{ nova_compute_image_full }}" image: "{{ nova_compute_image_full }}"
privileged: True privileged: True
enabled: "{{ not enable_nova_fake | bool or not enable_ironic | bool }}" enabled: "{{ not enable_nova_fake | bool and not enable_ironic | bool }}"
volumes: volumes:
- "{{ node_config_directory }}/nova-compute/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/nova-compute/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment