From a75af3d4c30af050dd15c0f875142f6328874fe4 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Thu, 12 Oct 2017 02:51:17 +0200
Subject: reclass: baremetal: Factor out common code

While at it, add .yamllint file (copied from releng repo).

Change-Id: I39630c0043fe2fd601510969c401e6cc9efbf69a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 .../openstack/compute.yml                          | 91 +---------------------
 1 file changed, 2 insertions(+), 89 deletions(-)

(limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml')

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
index 032dd8452..590241e8d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
@@ -1,37 +1,11 @@
 ---
 classes:
-  - system.linux.system.repo.mcp.openstack
-  - system.linux.system.repo.mcp.extra
-  - system.linux.storage.loopback
-  - system.glusterfs.client.cluster
-  - system.nova.compute.cluster
-  - system.nova.compute.nfv.hugepages
-  - system.nova.compute.nfv.cpu_pinning
-  - system.neutron.gateway.opendaylight.single
-  - system.neutron.gateway.cluster
-  - system.cinder.volume.single
-  - system.cinder.volume.backend.lvm
-  - system.ceilometer.agent.cluster
+  - cluster.baremetal-mcp-ocata-common.openstack_compute
   - cluster.baremetal-mcp-ocata-odl-ha.infra
+  - system.neutron.gateway.opendaylight.single
 parameters:
   _param:
-    cluster_vip_address: ${_param:openstack_control_address}
-    cluster_local_address: ${_param:control_address}
-    cluster_node01_hostname: ctl01
-    cluster_node01_address: ${_param:openstack_control_node01_address}
-    cluster_node02_hostname: ctl02
-    cluster_node02_address: ${_param:openstack_control_node02_address}
-    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}
     tenant_nic: ${_param:opnfv_baremetal_secondary_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
     neutron_agents:
       - neutron-dhcp-agent
       - neutron-metadata-agent
@@ -48,41 +22,14 @@ parameters:
       services: ${_param:neutron_agents}
       backend:
         router: ${_param:opendaylight_router}
-  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:
-    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}
         tenant_nic:
           enabled: true
           type: eth
           proto: manual
           name: ${_param:tenant_nic}
-        external_nic:
-          enabled: true
-          name: ${_param:external_nic}
-          mtu: ${_param:interface_mtu}
-          proto: manual
-          type: eth
         br-mesh:
           enabled: true
           type: bridge
@@ -91,13 +38,6 @@ parameters:
           mtu: 1500
           use_interfaces:
             - ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan}
-        mgmt-vlan:
-          enabled: true
-          proto: manual
-          type: vlan
-          name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
-          use_interfaces:
-            - ${_param:mgmt_nic}
         tenant-vlan:
           enabled: true
           proto: manual
@@ -105,30 +45,3 @@ parameters:
           name: ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan}
           use_interfaces:
             - ${_param:tenant_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
-- 
cgit 1.2.3-korg