[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>

1 files changed, 1 insertions, 62 deletions

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml
index e8421caa3..fd01f3c32 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml
@@ -1,23 +1,15 @@
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- cluster.virtual-mcp-ocata-common.openstack_gateway
 - system.neutron.gateway.opendaylight.single
 - cluster.virtual-mcp-ocata-odl
 parameters:
   _param:
-    primary_interface: ens4
-    tenant_interface: ens5
-    external_interface: ens6
-    interface_mtu: 9000
-    linux_system_codename: xenial
     neutron_agents:
     - neutron-l3-agent
     - neutron-dhcp-agent
     - neutron-metadata-agent
   neutron:
     gateway:
-      agent_mode: ${_param:neutron_gateway_agent_mode}
       pkgs: ${_param:neutron_agents}
       services: ${_param:neutron_agents}
   opendaylight:
@@ -28,45 +20,7 @@ parameters:
       provider_mappings: physnet1:br-floating
   linux:
     network:
-      bridge: openvswitch
       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-floating:
-          enabled: true
-          type: ovs_bridge
-          mtu: ${_param:interface_mtu}
-        br-mgmt:
-          enabled: true
-          type: bridge
-          proto: static
-          address: ${_param:single_address}
-          netmask: 255.255.255.0
-          mtu: ${_param:interface_mtu}
-          use_interfaces:
-          - ${_param:primary_interface}
         br-mesh:
           enabled: true
           type: bridge
@@ -76,18 +30,3 @@ parameters:
           netmask: 255.255.255.0
           use_interfaces:
           - ${_param:tenant_interface}
-        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_interface}
-          use_ovs_ports:
-          - float-to-ex