Merge "Fix classes ordering" into stable/pike
diff --git a/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml b/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml
index b4ef9c4..3a9e710 100755
--- a/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml
@@ -22,7 +22,6 @@
cluster_internal_protocol: http
cluster_public_protocol: http
baremetal_interface: ens7
- baremetal_gateway_ip: 192.168.90.1
ironic_version: ${_param:openstack_version}
ironic_service_protocol: ${_param:cluster_internal_protocol}
ironic_api_type: 'public'
@@ -38,6 +37,11 @@
openstack_baremetal_neutron_subnet_cidr: 192.168.90.0/24
openstack_baremetal_neutron_subnet_allocation_start: 192.168.90.100
openstack_baremetal_neutron_subnet_allocation_end: 192.168.90.150
+ baremetal_simulator:
+ deploy_ramdisk_file: tinyipa-stable-pike.gz
+ deploy_ramdisk_md5summ: ca663b0690ab15427d39427623ace291
+ deploy_kernel_file: tinyipa-stable-pike.vmlinuz
+ deploy_kernel_md5summ: 8bffc2d4ca84e7b6d1310fef7b8c6ddc
ironic:
api:
bind:
@@ -112,14 +116,6 @@
linux:
network:
interface:
- baremetal_interface:
- enabled: true
- name: ${_param:baremetal_interface}
- mtu: ${_param:interface_mtu}
- proto: static
- address: ${_param:baremetal_gateway_ip}
- netmask: 255.255.255.0
- type: eth
br-baremetal:
enabled: true
type: ovs_bridge