From bc9130d822e118254d6a89c57609480196edb953 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Wed, 22 Feb 2017 09:57:07 +0800
Subject: [PATCH] Run nova-compute and nova-compute-ironic at the same time on
kolla-k8s
In kolla-kubernetes, nova-compute-ironic is ran with a separate virtual
interface with a different hostname. So it is OK to run nova-compute and
nova-compute-ironic on the same node.
Change-Id: I3b0f12f128af8210bc97502dbc01469f619dd1ac
---
ansible/roles/nova/defaults/main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml
index e4e0f7ca0c..d92a991485 100644
--- a/ansible/roles/nova/defaults/main.yml
+++ b/ansible/roles/nova/defaults/main.yml
@@ -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"