Skip to content
Snippets Groups Projects
Commit 5683b718 authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review
Browse files

Merge "Fix nova fake driver support"

parents 5b98751a 8e9cd4d2
No related branches found
No related tags found
No related merge requests found
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
with_sequence: "start=1 end={{ num_nova_fake_per_node }}" with_sequence: "start=1 end={{ num_nova_fake_per_node }}"
when: when:
- action != "config" - action != "config"
- enabled_nova_fake | bool - enable_nova_fake | bool
- neutron_plugin_agent == "openvswitch" - neutron_plugin_agent == "openvswitch"
- inventory_hostname in groups["compute"] - inventory_hostname in groups["compute"]
- fake_config_json | changed - fake_config_json | changed
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
with_sequence: "start=1 end={{ num_nova_fake_per_node }}" with_sequence: "start=1 end={{ num_nova_fake_per_node }}"
when: when:
- action != "config" - action != "config"
- enabled_nova_fake | bool - enable_nova_fake | bool
- neutron_plugin_agent == "sfc" - neutron_plugin_agent == "sfc"
- inventory_hostname in groups["compute"] - inventory_hostname in groups["compute"]
- fake_config_json | changed - fake_config_json | changed
......
...@@ -32,7 +32,7 @@ scheduler_default_filters = RetryFilter,AvailabilityZoneFilter,ComputeFilter,Com ...@@ -32,7 +32,7 @@ scheduler_default_filters = RetryFilter,AvailabilityZoneFilter,ComputeFilter,Com
{% if orchestration_engine == 'KUBERNETES' %} {% if orchestration_engine == 'KUBERNETES' %}
host = empty host = empty
{% else %} {% else %}
host = {{ ansible_hostname }}_{{ item }} host = {{ ansible_hostname }}_{{ service_name }}
{% endif %} {% endif %}
compute_driver = fake.FakeDriver compute_driver = fake.FakeDriver
{% else %} {% else %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment