Fix interface naming in mitaka-ovs-trusty model
Change interface naming from ens* to eth*
Change-Id: I917dca28a0450827293f78901b2e3f3506ef2af8
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/compute.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/compute.yml
index 761bea8..7646ca0 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/compute.yml
@@ -10,9 +10,9 @@
- cluster.virtual-mcp-mitaka-ovs-trusty
parameters:
_param:
- primary_interface: ens4
- tenant_interface: ens5
- external_interface: ens6
+ primary_interface: eth1
+ tenant_interface: eth2
+ external_interface: eth3
interface_mtu: 1500
nova:
compute:
@@ -33,7 +33,7 @@
interface:
dhcp_int:
enabled: true
- name: ens3
+ name: eth0
proto: dhcp
type: eth
mtu: ${_param:interface_mtu}
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
index 7a50acd..bfe22fc 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
@@ -41,7 +41,7 @@
parameters:
_param:
- keepalived_vip_interface: ens4
+ keepalived_vip_interface: eth1
linux:
system:
package:
@@ -49,7 +49,7 @@
version: latest
network:
interface:
- ens4:
+ eth1:
enabled: true
type: eth
proto: static
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/dashboard.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/dashboard.yml
index 050c6cd..177b577 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/dashboard.yml
@@ -7,7 +7,7 @@
linux:
network:
interface:
- ens4:
+ eth1:
enabled: true
type: eth
proto: static
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/gateway.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/gateway.yml
index 8bc9dfa..0aa1032 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/gateway.yml
@@ -6,9 +6,9 @@
- cluster.virtual-mcp-mitaka-ovs-trusty
parameters:
_param:
- primary_interface: ens4
- tenant_interface: ens5
- external_interface: ens6
+ primary_interface: eth1
+ tenant_interface: eth2
+ external_interface: eth3
interface_mtu: 9000
linux:
network:
@@ -16,7 +16,7 @@
interface:
dhcp_int:
enabled: true
- name: ens3
+ name: eth0
proto: dhcp
type: eth
mtu: ${_param:interface_mtu}
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/server.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/server.yml
index af9f983..2202580 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/server.yml
@@ -35,7 +35,7 @@
kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
keepalived_prometheus_vip_password: 'password'
- keepalived_prometheus_vip_interface: ens4
+ keepalived_prometheus_vip_interface: eth1
cluster_vip_address: ${_param:stacklight_monitor_address}
cluster_local_address: ${_param:single_address}
cluster_elasticsearch_port: 9200
@@ -65,7 +65,7 @@
linux:
network:
interface:
- ens4:
+ eth1:
enabled: true
type: eth
proto: static