openstack/kolla-ansible
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2017-03-09 17:33:43 +00:00 committed by Gerrit Code Review
commit 4fde3b10b3
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