aboutsummaryrefslogtreecommitdiffstats
path: root/scenarios/os-odl-sfc/role/os-odl-sfc/templates/ha
diff options
context:
space:
mode:
authorManuel Buil <mbuil@suse.com>2018-10-04 13:45:26 +0200
committerManuel Buil <mbuil@suse.com>2018-10-04 15:40:22 +0200
commit52593422296aa6d15f175d10d722f8ebac42c74f (patch)
tree800ba444db6820b2722c41bbd3e196557615b1ca /scenarios/os-odl-sfc/role/os-odl-sfc/templates/ha
parent2845d3fa299b180ed761cc8ca4fcb7e1a43d9aa2 (diff)
Add neutron_dnsmasq_force_metadata: True
When deploying with ODL, the static route towards the metadata server is not set and the only alternative is getting the route pushed to the VM. To do so, we must add the "force_metadata: True" option to the dnsmasq: https://github.com/openstack/openstack-ansible-os_neutron/commit/a8c7e0b506a0c347a363dde3f60077aa0cab5641 Change-Id: I43f9cabacf6cc8b82a22f1f0eedb36b9f1f0c31f Signed-off-by: Manuel Buil <mbuil@suse.com>
Diffstat (limited to 'scenarios/os-odl-sfc/role/os-odl-sfc/templates/ha')
-rw-r--r--scenarios/os-odl-sfc/role/os-odl-sfc/templates/ha/user_sfc_scenarios_variables_suse.yml.j23
-rw-r--r--scenarios/os-odl-sfc/role/os-odl-sfc/templates/ha/user_sfc_scenarios_variables_ubuntu.yml.j22
2 files changed, 5 insertions, 0 deletions
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/templates/ha/user_sfc_scenarios_variables_suse.yml.j2 b/scenarios/os-odl-sfc/role/os-odl-sfc/templates/ha/user_sfc_scenarios_variables_suse.yml.j2
index 435ec9df..8cec75c3 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/templates/ha/user_sfc_scenarios_variables_suse.yml.j2
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/templates/ha/user_sfc_scenarios_variables_suse.yml.j2
@@ -116,6 +116,9 @@ openstack_host_specific_kernel_modules:
- name: openvswitch
openstack_host_metal_distro_packages: "{{ ovs_nsh_required_metal_packages + _openstack_host_metal_distro_packages }}"
+
+# To avoid functest complaining because cirros vm gets stuck trying to contact the metadata server
+neutron_dnsmasq_force_metadata: True
{% endraw %}
{% if odl_repo_version is defined %}
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/templates/ha/user_sfc_scenarios_variables_ubuntu.yml.j2 b/scenarios/os-odl-sfc/role/os-odl-sfc/templates/ha/user_sfc_scenarios_variables_ubuntu.yml.j2
index 48b3babe..c5b1f19b 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/templates/ha/user_sfc_scenarios_variables_ubuntu.yml.j2
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/templates/ha/user_sfc_scenarios_variables_ubuntu.yml.j2
@@ -122,6 +122,8 @@ ovs_nsh_required_metal_packages:
openstack_host_metal_distro_packages: "{{ ovs_nsh_required_metal_packages + _openstack_host_metal_distro_packages }}"
+# To avoid functest complaining because cirros vm gets stuck trying to contact the metadata server
+neutron_dnsmasq_force_metadata: True
{% endraw %}
{% if odl_repo_version is defined %}