From f85c84133c2f8d6aec3c707cfb92cb03db543bd6 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Fri, 26 May 2017 12:12:15 +0400 Subject: [mcp] Replace reclass system models with submodule Change-Id: Id693f7b0f3542d605b0f71601f3bd21eb882c7ba Signed-off-by: Michael Polenchuk --- .../system/neutron/control/openvswitch/cluster.yml | 71 ---------------------- .../system/neutron/control/openvswitch/dpdk.yml | 4 -- .../system/neutron/control/openvswitch/single.yml | 45 -------------- .../system/neutron/control/openvswitch/sriov.yml | 7 --- 4 files changed, 127 deletions(-) delete mode 100644 mcp/reclass/classes/system/neutron/control/openvswitch/cluster.yml delete mode 100644 mcp/reclass/classes/system/neutron/control/openvswitch/dpdk.yml delete mode 100644 mcp/reclass/classes/system/neutron/control/openvswitch/single.yml delete mode 100644 mcp/reclass/classes/system/neutron/control/openvswitch/sriov.yml (limited to 'mcp/reclass/classes/system/neutron/control/openvswitch') diff --git a/mcp/reclass/classes/system/neutron/control/openvswitch/cluster.yml b/mcp/reclass/classes/system/neutron/control/openvswitch/cluster.yml deleted file mode 100644 index dc8e0c53f..000000000 --- a/mcp/reclass/classes/system/neutron/control/openvswitch/cluster.yml +++ /dev/null @@ -1,71 +0,0 @@ -classes: -- service.keepalived.cluster.single -- service.haproxy.proxy.single -- service.neutron.control.cluster -parameters: - _param: - neutron_control_dvr: True - neutron_l3_ha: False - neutron_global_physnet_mtu: 1500 - neutron_external_mtu: 1500 - neutron_tenant_network_types: "flat,vxlan" - neutron: - server: - plugin: ml2 - global_physnet_mtu: ${_param:neutron_global_physnet_mtu} - l3_ha: ${_param:neutron_l3_ha} - dvr: ${_param:neutron_control_dvr} - backend: - engine: ml2 - tenant_network_types: "${_param:neutron_tenant_network_types}" - external_mtu: ${_param:neutron_external_mtu} - mechanism: - ovs: - driver: openvswitch - compute: - region: ${_param:openstack_region} - database: - host: ${_param:openstack_database_address} - identity: - region: ${_param:openstack_region} - message_queue: - members: - - host: ${_param:openstack_message_queue_node01_address} - - host: ${_param:openstack_message_queue_node02_address} - - host: ${_param:openstack_message_queue_node03_address} - mysql: - server: - database: - neutron: - encoding: utf8 - users: - - name: neutron - password: ${_param:mysql_neutron_password} - host: '%' - rights: all - - name: neutron - password: ${_param:mysql_neutron_password} - host: ${_param:cluster_local_address} - rights: all - haproxy: - proxy: - listen: - neutron_api: - type: openstack-service - service_name: neutron - binds: - - address: ${_param:cluster_vip_address} - port: 9696 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9696 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 9696 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 9696 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 diff --git a/mcp/reclass/classes/system/neutron/control/openvswitch/dpdk.yml b/mcp/reclass/classes/system/neutron/control/openvswitch/dpdk.yml deleted file mode 100644 index f7191c772..000000000 --- a/mcp/reclass/classes/system/neutron/control/openvswitch/dpdk.yml +++ /dev/null @@ -1,4 +0,0 @@ -parameters: - neutron: - server: - dpdk: True \ No newline at end of file diff --git a/mcp/reclass/classes/system/neutron/control/openvswitch/single.yml b/mcp/reclass/classes/system/neutron/control/openvswitch/single.yml deleted file mode 100644 index 6601db1e9..000000000 --- a/mcp/reclass/classes/system/neutron/control/openvswitch/single.yml +++ /dev/null @@ -1,45 +0,0 @@ -classes: -- service.neutron.control.single -parameters: - _param: - neutron_control_dvr: True - neutron_l3_ha: False - neutron_global_physnet_mtu: 1500 - neutron_external_mtu: 1500 - neutron_tenant_network_types: "flat,vxlan" - neutron: - server: - plugin: ml2 - global_physnet_mtu: ${_param:neutron_global_physnet_mtu} - l3_ha: ${_param:neutron_l3_ha} - dvr: ${_param:neutron_control_dvr} - backend: - engine: ml2 - tenant_network_types: "${_param:neutron_tenant_network_types}" - external_mtu: ${_param:neutron_external_mtu} - mechanism: - ovs: - driver: openvswitch - compute: - region: ${_param:openstack_region} - database: - host: ${_param:openstack_database_address} - identity: - region: ${_param:openstack_region} - message_queue: - members: - - host: ${_param:openstack_message_queue_node01_address} - mysql: - server: - database: - neutron: - encoding: utf8 - users: - - name: neutron - password: ${_param:mysql_neutron_password} - host: '%' - rights: all - - name: neutron - password: ${_param:mysql_neutron_password} - host: ${_param:cluster_local_address} - rights: all \ No newline at end of file diff --git a/mcp/reclass/classes/system/neutron/control/openvswitch/sriov.yml b/mcp/reclass/classes/system/neutron/control/openvswitch/sriov.yml deleted file mode 100644 index 38f5d29b0..000000000 --- a/mcp/reclass/classes/system/neutron/control/openvswitch/sriov.yml +++ /dev/null @@ -1,7 +0,0 @@ -parameters: - neutron: - server: - backend: - mechanism: - sriov: - driver: sriovnicswitch -- cgit 1.2.3-korg