openstack/kolla-ansible
Code Issues Proposed changes

Enable run nova-compute-ironic with nova-compute on the same node

Browse Source 
It is unnecessary and a waste to run nova-compute-ironic on a single
node, change the host name field in nova-compute-ironic could ensure
nova-compute and nova-compute-ironic run on the same node.

Change-Id: If2acbf25caab0570da444472003599b9e0f2a1ff
Closes-Bug: #1671103
This commit is contained in:
Jeffrey Zhang 2017-03-08 21:59:09 +08:00
parent 56445484d5
commit a2f2e322be
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/nova/defaults/main.yml
View File

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

1
ansible/roles/nova/templates/nova.conf.j2
View File

@ -33,6 +33,7 @@ scheduler_host_manager = ironic_host_manager
{% endif %}
{% if service_name == "nova-compute-ironic" %}
host={{ ansible_hostname }}-ironic
compute_driver = ironic.IronicDriver
vnc_enabled = False
ram_allocation_ratio = 1.0