openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix nova fake driver support"

Browse Source
This commit is contained in:
Jenkins 2017-06-02 09:15:06 +00:00 committed by Gerrit Code Review
commit 5683b71845
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/neutron/handlers/main.yml
View File

@ -73,7 +73,7 @@
with_sequence: "start=1 end={{ num_nova_fake_per_node }}"
when:
- action != "config"
- enabled_nova_fake | bool
- enable_nova_fake | bool
- neutron_plugin_agent == "openvswitch"
- inventory_hostname in groups["compute"]
- fake_config_json | changed
@ -100,7 +100,7 @@
with_sequence: "start=1 end={{ num_nova_fake_per_node }}"
when:
- action != "config"
- enabled_nova_fake | bool
- enable_nova_fake | bool
- neutron_plugin_agent == "sfc"
- inventory_hostname in groups["compute"]
- fake_config_json | changed

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

@ -32,7 +32,7 @@ scheduler_default_filters = RetryFilter,AvailabilityZoneFilter,ComputeFilter,Com
{% if orchestration_engine == 'KUBERNETES' %}
host = empty
{% else %}
host = {{ ansible_hostname }}_{{ item }}
host = {{ ansible_hostname }}_{{ service_name }}
{% endif %}
compute_driver = fake.FakeDriver
{% else %}