Merge "[virtual] Update dpdk scenario with pike"

[fuel.git] / mcp / reclass / classes / cluster / baremetal-mcp-ocata-common / openstack_compute.yml

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
index aca416e..e07e611 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
@@ -7,8 +7,8 @@
 ##############################################################################
 ---
 classes:
-  - system.linux.system.repo.mcp.openstack
   - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.glusterfs
   - system.linux.storage.loopback
   - system.glusterfs.client.cluster
   - system.nova.compute.cluster
@@ -18,6 +18,7 @@ classes:
   - system.cinder.volume.single
   - system.cinder.volume.backend.lvm
   - system.ceilometer.agent.cluster
+  - cluster.baremetal-mcp-ocata-common.openstack_compute_init
 parameters:
   _param:
     cluster_vip_address: ${_param:openstack_control_address}
@@ -29,74 +30,32 @@ parameters:
     cluster_node03_hostname: ctl03
     cluster_node03_address: ${_param:openstack_control_node03_address}
     nova_vncproxy_url: https://${_param:cluster_public_host}:6080
-    mgmt_nic: ${_param:opnfv_baremetal_primary_nic}
-    external_nic: ${_param:opnfv_baremetal_tertiary_nic}
     interface_mtu: 1500
     keepalived_vip_interface: br-ctl
     keepalived_vip_virtual_router_id: 69
     loopback_device_size: 20
     linux_system_codename: xenial
+    glusterfs_version: '3.10'
+    # {dhcp,single}_nic are not used, but referenced
+    dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
+    single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
   glusterfs:
     client:
       volumes:
         nova_instances:
           path: /var/lib/nova/instances
           server: ${_param:glusterfs_service_host}
-          user: nova
-          group: nova
           # yamllint disable-line rule:line-length
           opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}"
   linux:
+    network:
+      remove_iface_files:
+        - '/etc/network/interfaces.d/50-cloud-init.cfg'
     system:
       kernel:
         sysctl:
           vm.dirty_ratio: 10
           vm.dirty_background_ratio: 5
-    network:
-      bridge: openvswitch
-      interface:
-        mgmt_nic:
-          enabled: true
-          type: eth
-          proto: dhcp
-          name: ${_param:mgmt_nic}
-        external_nic:
-          enabled: true
-          name: ${_param:external_nic}
-          mtu: ${_param:interface_mtu}
-          proto: manual
-          type: eth
-        mgmt-vlan:
-          enabled: true
-          proto: manual
-          type: vlan
-          name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
-          use_interfaces:
-            - ${_param:mgmt_nic}
-        br-ctl:
-          enabled: true
-          type: bridge
-          proto: static
-          address: ${_param:single_address}
-          netmask: 255.255.255.0
-          use_interfaces:
-            - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
-        br-floating:
-          enabled: true
-          type: ovs_bridge
-          mtu: ${_param:interface_mtu}
-        float-to-ex:
-          enabled: true
-          type: ovs_port
-          mtu: ${_param:interface_mtu}
-          bridge: br-floating
-        br-ex:
-          enabled: true
-          type: bridge
-          mtu: ${_param:interface_mtu}
-          address: ${_param:external_address}
-          netmask: 255.255.255.0
-          use_interfaces:
-            - ${_param:external_nic}
-          use_ovs_ports:
-            - float-to-ex
+  neutron:
+    gateway:
+      vlan_aware_vms: true