From 126ce2598684e14d933cf8b8666b895071d1fdd0 Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Fri, 18 Aug 2017 13:55:40 +0400
Subject: [virtual] Apply ceilometer/aodh services

* run ceilometer/aodh states
* wrap common virtual cluster options
* get the source image based on timestamps

Change-Id: I88f1d63ed4a94eba4ec0a9cf33d36d51c75ae355
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---
 .../openstack/compute.yml                          | 68 +---------------------
 1 file changed, 1 insertion(+), 67 deletions(-)

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

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
index ba710a36e..5cfcd8d05 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
@@ -1,46 +1,7 @@
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.linux.storage.loopback
-- system.nova.compute.single
-- service.neutron.compute.single
-- service.cinder.volume.single
-- system.cinder.volume.backend.lvm
+- cluster.virtual-mcp-ocata-common.openstack_compute
 - cluster.virtual-mcp-ocata-odl-router
 parameters:
-  _param:
-    primary_interface: ens4
-    tenant_interface: ens5
-    external_interface: ens6
-    interface_mtu: 9000
-    linux_system_codename: xenial
-    loopback_device_size: 10
-  nova:
-    compute:
-      vncproxy_url: http://${_param:cluster_vip_address}:6080
-      network:
-        region: ${_param:openstack_region}
-        user: neutron
-        tenant: service
-        password: ${_param:keystone_neutron_password}
-  neutron:
-    compute:
-      agent_mode: ${_param:neutron_compute_agent_mode}
-      message_queue:
-        host: ${_param:openstack_control_address}
-      metadata:
-        host: ${_param:openstack_control_address}
-  cinder:
-    volume:
-      database:
-        host: ${_param:cluster_local_address}
-      identity:
-        host: ${_param:cluster_local_address}
-      glance:
-        host: ${_param:cluster_local_address}
-      message_queue:
-        host: ${_param:cluster_local_address}
   opendaylight:
     client:
       ovsdb_server_iface: ptcp:6639:127.0.0.1
@@ -49,41 +10,14 @@ parameters:
       provider_mappings: physnet1:br-floating
   linux:
     network:
-      bridge: openvswitch
       gateway: ${_param:openstack_gateway_address}
       interface:
-        dhcp_int:
-          enabled: true
-          name: ens3
-          proto: dhcp
-          type: eth
-          mtu: ${_param:interface_mtu}
-        primary_interface:
-          enabled: true
-          name: ${_param:primary_interface}
-          mtu: ${_param:interface_mtu}
-          proto: manual
-          type: eth
-        tenant_interface:
-          enabled: true
-          name: ${_param:tenant_interface}
-          mtu: ${_param:interface_mtu}
-          proto: manual
-          type: eth
         external_interface:
           enabled: true
           name: ${_param:external_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
-        br-mgmt:
-          enabled: true
-          type: bridge
-          proto: static
-          address: ${_param:single_address}
-          netmask: 255.255.255.0
-          use_interfaces:
-          - ${_param:primary_interface}
         br-mesh:
           enabled: true
           type: bridge
-- 
cgit 1.2.3-korg