[ha] Run OpenDaylight in cluster mode

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

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
index df90bc4..b9bf6aa 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
@@ -8,7 +8,7 @@
 ---
 classes:
   - system.linux.system.repo.mcp.mirror.v1.openstack
-  - system.linux.system.repo.glusterfs
+  - system.linux.system.single.simple
   - system.glusterfs.client.cluster
   - system.nova.compute.cluster
   - system.nova.compute.nfv.hugepages
@@ -18,9 +18,10 @@ classes:
   - system.ceilometer.agent.cluster
   - system.ceilometer.agent.polling.default
   - service.barbican.client.cluster
+  - cluster.mcp-common-ha.glusterfs_repo
   - cluster.mcp-common-ha.openstack_compute_pdf
-  - cluster.mcp-common-ha.include.maas_proxy
-  - cluster.mcp-common-ha.include.lab_proxy_pdf
+  - cluster.all-mcp-arch-common.opnfv.maas_proxy
+  - cluster.all-mcp-arch-common.opnfv.lab_proxy_pdf
 parameters:
   _param:
     cluster_vip_address: ${_param:openstack_control_address}
@@ -36,7 +37,6 @@ parameters:
     keepalived_vip_interface: br-ctl
     keepalived_vip_virtual_router_id: 69
     linux_system_codename: xenial
-    glusterfs_version: '3.13'
   glusterfs:
     client:
       volumes:
@@ -47,6 +47,7 @@ parameters:
           opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}"
   cinder:
     volume:
+      my_ip: ${_param:single_address}
       backend:
         lvm-driver:
           # Align system.cinder.volume.backend.lvm and MaaS data
@@ -66,9 +67,10 @@ parameters:
         sysctl:
           vm.dirty_ratio: 10
           vm.dirty_background_ratio: 5
-        boot_options:
+        ~boot_options:
           - spectre_v2=off
           - nopti
+          - ipv6.disable=0
   neutron:
     gateway:
       vlan_aware_vms: true
@@ -79,3 +81,5 @@ parameters:
       preallocate_images: space
       barbican:
         enabled: ${_param:barbican_integration_enabled}
+      image:
+        verify_glance_signatures: false