Add an ability to set base_mac and dvr_base_mac in neutron.
Customer-Found
Change-Id: I28d05608152e2e053817271712f9f31e6d780010
diff --git a/tests/pillar/compute_dvr.sls b/tests/pillar/compute_dvr.sls
index f172d70..9213e38 100644
--- a/tests/pillar/compute_dvr.sls
+++ b/tests/pillar/compute_dvr.sls
@@ -1,5 +1,7 @@
neutron:
compute:
+ base_mac: fa:16:3f:00:00:00
+ dvr_base_mac: fa:16:3f:a0:00:00
agent_mode: dvr
backend:
engine: ml2
@@ -22,4 +24,4 @@
host: 127.0.0.1
password: password
workers: 2
- version: mitaka
\ No newline at end of file
+ version: pike
diff --git a/tests/pillar/control_dvr.sls b/tests/pillar/control_dvr.sls
index 1bf7b7a..5e797d0 100644
--- a/tests/pillar/control_dvr.sls
+++ b/tests/pillar/control_dvr.sls
@@ -1,5 +1,7 @@
neutron:
server:
+ base_mac: fa:16:3f:00:00:00
+ dvr_base_mac: fa:16:3f:a0:00:00
api_workers: 2
rpc_workers: 2
rpc_state_report_workers: 2
@@ -47,7 +49,7 @@
port: 5672
user: openstack
virtual_host: /openstack
- version: mitaka
+ version: pike
policy:
create_subnet: 'rule:admin_or_network_owner'
'get_network:queue_id': 'rule:admin_only'
diff --git a/tests/pillar/gateway_dvr.sls b/tests/pillar/gateway_dvr.sls
index fb3acd6..2751c75 100644
--- a/tests/pillar/gateway_dvr.sls
+++ b/tests/pillar/gateway_dvr.sls
@@ -1,5 +1,7 @@
neutron:
gateway:
+ base_mac: fa:16:3f:00:00:00
+ dvr_base_mac: fa:16:3f:a0:00:00
agent_mode: dvr_snat
backend:
engine: ml2
@@ -22,4 +24,4 @@
host: 127.0.0.1
password: password
workers: 2
- version: mitaka
\ No newline at end of file
+ version: pike