Merge "Run nova-compute and nova-compute-ironic at the same time on kolla-k8s"

This commit is contained in:
Jenkins 2017-02-22 12:14:33 +00:00 committed by Gerrit Code Review
commit 3d356b426b

View File

@ -112,7 +112,7 @@ nova_services:
group: "compute"
image: "{{ nova_compute_image_full }}"
privileged: True
enabled: "{{ not enable_nova_fake | bool and not enable_ironic | bool }}"
enabled: "{{ True if orchestration_engine == 'KUBERNETES' else not enable_nova_fake | bool and not enable_ironic | bool }}"
volumes:
- "{{ node_config_directory }}/nova-compute/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"