Fix *agent.ini for QoS extension
Replace incorrect "server" with "neutron" and
set correct OpenStack vesrion for tests.
Change-Id: Ie8c5bfe8ceaf82fed19e9cd5634c1e1ca9e86ccc
diff --git a/neutron/files/ocata/openvswitch_agent.ini b/neutron/files/ocata/openvswitch_agent.ini
index e69861c..f6d80a5 100644
--- a/neutron/files/ocata/openvswitch_agent.ini
+++ b/neutron/files/ocata/openvswitch_agent.ini
@@ -195,7 +195,7 @@
#agent_type = Open vSwitch agent
# Extensions list to use (list value)
-{% if server.get('qos', 'True') %}
+{% if neutron.get('qos', 'True') %}
extensions = qos
{% endif %}
diff --git a/neutron/files/ocata/sriov_agent.ini b/neutron/files/ocata/sriov_agent.ini
index 797352b..eebd662 100644
--- a/neutron/files/ocata/sriov_agent.ini
+++ b/neutron/files/ocata/sriov_agent.ini
@@ -122,7 +122,7 @@
#
# Extensions list to use (list value)
-{% if server.get('qos', 'True') %}
+{% if neutron.get('qos', 'True') %}
extensions = qos
{% endif %}
diff --git a/tests/pillar/compute_qos.sls b/tests/pillar/compute_qos.sls
index ca1f186..2122e00 100644
--- a/tests/pillar/compute_qos.sls
+++ b/tests/pillar/compute_qos.sls
@@ -22,4 +22,4 @@
metadata:
host: 127.0.0.1
password: password
- version: mitaka
\ No newline at end of file
+ version: ocata
\ No newline at end of file
diff --git a/tests/pillar/compute_qos_sriov.sls b/tests/pillar/compute_qos_sriov.sls
index 11fb212..7d4d4ab 100644
--- a/tests/pillar/compute_qos_sriov.sls
+++ b/tests/pillar/compute_qos_sriov.sls
@@ -26,4 +26,4 @@
metadata:
host: 127.0.0.1
password: password
- version: mitaka
+ version: ocata
diff --git a/tests/pillar/gateway_qos.sls b/tests/pillar/gateway_qos.sls
index 0447011..fea882e 100644
--- a/tests/pillar/gateway_qos.sls
+++ b/tests/pillar/gateway_qos.sls
@@ -22,4 +22,4 @@
metadata:
host: 127.0.0.1
password: password
- version: mitaka
+ version: ocata