Merge "Configuring ens3 and ens4 interfaces"
diff --git a/classes/cluster/virtual-mcp11-aio/init.yml b/classes/cluster/virtual-mcp11-aio/init.yml
index 614dfd3..a1cf88f 100755
--- a/classes/cluster/virtual-mcp11-aio/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/init.yml
@@ -58,6 +58,10 @@
- pin: ${_param:linux_system_repo_pin}
priority: ${_param:linux_system_repo_priority}
package: '*'
+ # workaround for PROD-15657, mysql 5.7 isn't built, using 5.6 instead
+ - pin: 'version 5.6*'
+ priority: 1300
+ package: 'mysql-client'
network:
bridge: openvswitch
interface:
@@ -71,6 +75,16 @@
proto: static
address: ${_param:openstack_public_neutron_subnet_gateway}
netmask: 255.255.255.0
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ ens3:
+ enabled: true
+ type: eth
+ proto: dhcp
# override on this level
nova:
compute:
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 9615618..6b8a6e2 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -20,6 +20,7 @@
- system.galera.server.database.barbican
- system.keystone.client.single
- system.keystone.client.service.barbican
+- system.keystone.client.service.cinder3
- system.keystone.client.service.nova21
- system.keystone.client.service.nova-placement
- system.keystone.client.service.designate