From a6daf4ece3f05600ad66fea55c5220d07a71cef1 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Wed, 24 May 2017 12:44:05 +0400 Subject: [mcp] Bring in reclass system salt models Change-Id: I1a865b7524f3a5242544e60e6b36b1092721c58b Signed-off-by: Michael Polenchuk --- .../classes/system/neutron/compute/cluster.yml | 15 +++++ .../classes/system/neutron/compute/nfv/dpdk.yml | 17 ++++++ .../classes/system/neutron/compute/nfv/sriov.yml | 8 +++ .../neutron/compute/notification/messagingv2.yml | 6 ++ .../classes/system/neutron/control/cluster.yml | 45 ++++++++++++++ .../system/neutron/control/notification/cadf.yml | 5 ++ .../neutron/control/notification/messagingv2.yml | 6 ++ .../neutron/control/opencontrail/cluster.yml | 44 ++++++++++++++ .../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 +++ .../classes/system/neutron/control/single.yml | 22 +++++++ .../classes/system/neutron/gateway/cluster.yml | 14 +++++ .../neutron/gateway/notification/messagingv2.yml | 6 ++ 15 files changed, 315 insertions(+) create mode 100644 mcp/reclass/classes/system/neutron/compute/cluster.yml create mode 100644 mcp/reclass/classes/system/neutron/compute/nfv/dpdk.yml create mode 100644 mcp/reclass/classes/system/neutron/compute/nfv/sriov.yml create mode 100644 mcp/reclass/classes/system/neutron/compute/notification/messagingv2.yml create mode 100644 mcp/reclass/classes/system/neutron/control/cluster.yml create mode 100644 mcp/reclass/classes/system/neutron/control/notification/cadf.yml create mode 100644 mcp/reclass/classes/system/neutron/control/notification/messagingv2.yml create mode 100644 mcp/reclass/classes/system/neutron/control/opencontrail/cluster.yml create mode 100644 mcp/reclass/classes/system/neutron/control/openvswitch/cluster.yml create mode 100644 mcp/reclass/classes/system/neutron/control/openvswitch/dpdk.yml create mode 100644 mcp/reclass/classes/system/neutron/control/openvswitch/single.yml create mode 100644 mcp/reclass/classes/system/neutron/control/openvswitch/sriov.yml create mode 100644 mcp/reclass/classes/system/neutron/control/single.yml create mode 100644 mcp/reclass/classes/system/neutron/gateway/cluster.yml create mode 100644 mcp/reclass/classes/system/neutron/gateway/notification/messagingv2.yml (limited to 'mcp/reclass/classes/system/neutron') diff --git a/mcp/reclass/classes/system/neutron/compute/cluster.yml b/mcp/reclass/classes/system/neutron/compute/cluster.yml new file mode 100644 index 000000000..989700645 --- /dev/null +++ b/mcp/reclass/classes/system/neutron/compute/cluster.yml @@ -0,0 +1,15 @@ +classes: +- service.neutron.compute.single +parameters: + neutron: + compute: + dvr: ${_param:neutron_compute_dvr} + agent_mode: ${_param:neutron_compute_agent_mode} + external_access: ${_param:neutron_compute_external_access} + backend: + tenant_network_types: ${_param:neutron_tenant_network_types}" + message_queue: + members: + - host: ${_param:openstack_message_queue_node01_address} + - host: ${_param:openstack_message_queue_node02_address} + - host: ${_param:openstack_message_queue_node03_address} \ No newline at end of file diff --git a/mcp/reclass/classes/system/neutron/compute/nfv/dpdk.yml b/mcp/reclass/classes/system/neutron/compute/nfv/dpdk.yml new file mode 100644 index 000000000..90f909588 --- /dev/null +++ b/mcp/reclass/classes/system/neutron/compute/nfv/dpdk.yml @@ -0,0 +1,17 @@ +parameters: + _param: + compute_dpdk_driver: uio + linux: + network: + bridge: openvswitch + dpdk: + enabled: true + driver: "${_param:compute_dpdk_driver}" + openvswitch: + pmd_cpu_mask: "${_param:compute_ovs_pmd_cpu_mask}" + dpdk_socket_mem: "${_param:compute_ovs_dpdk_socket_mem}" + dpdk_lcore_mask: "${_param:compute_ovs_dpdk_lcore_mask}" + memory_channels: "${_param:compute_ovs_memory_channels}" + neutron: + compute: + dpdk: True diff --git a/mcp/reclass/classes/system/neutron/compute/nfv/sriov.yml b/mcp/reclass/classes/system/neutron/compute/nfv/sriov.yml new file mode 100644 index 000000000..882e703aa --- /dev/null +++ b/mcp/reclass/classes/system/neutron/compute/nfv/sriov.yml @@ -0,0 +1,8 @@ +parameters: + neutron: + compute: + backend: + sriov: + sriov_nic01: + devname: ${_param:sriov_nic01_device_name} + physical_network: ${_param:sriov_nic01_physical_network} diff --git a/mcp/reclass/classes/system/neutron/compute/notification/messagingv2.yml b/mcp/reclass/classes/system/neutron/compute/notification/messagingv2.yml new file mode 100644 index 000000000..0e9d34a77 --- /dev/null +++ b/mcp/reclass/classes/system/neutron/compute/notification/messagingv2.yml @@ -0,0 +1,6 @@ +parameters: + neutron: + compute: + notification: + driver: messagingv2 + topics: "${_param:openstack_notification_topics}" diff --git a/mcp/reclass/classes/system/neutron/control/cluster.yml b/mcp/reclass/classes/system/neutron/control/cluster.yml new file mode 100644 index 000000000..dd1d3eedf --- /dev/null +++ b/mcp/reclass/classes/system/neutron/control/cluster.yml @@ -0,0 +1,45 @@ +classes: +- service.keepalived.cluster.single +- service.haproxy.proxy.single +- service.neutron.control.cluster +- system.haproxy.proxy.listen.openstack.neutron +parameters: + 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 + neutron: + server: + plugin: contrail diff --git a/mcp/reclass/classes/system/neutron/control/notification/cadf.yml b/mcp/reclass/classes/system/neutron/control/notification/cadf.yml new file mode 100644 index 000000000..f00f96f31 --- /dev/null +++ b/mcp/reclass/classes/system/neutron/control/notification/cadf.yml @@ -0,0 +1,5 @@ +parameters: + neutron: + server: + audit: + enabled: true diff --git a/mcp/reclass/classes/system/neutron/control/notification/messagingv2.yml b/mcp/reclass/classes/system/neutron/control/notification/messagingv2.yml new file mode 100644 index 000000000..70e86181a --- /dev/null +++ b/mcp/reclass/classes/system/neutron/control/notification/messagingv2.yml @@ -0,0 +1,6 @@ +parameters: + neutron: + server: + notification: + driver: messagingv2 + topics: "${_param:openstack_notification_topics}" diff --git a/mcp/reclass/classes/system/neutron/control/opencontrail/cluster.yml b/mcp/reclass/classes/system/neutron/control/opencontrail/cluster.yml new file mode 100644 index 000000000..caaaf6d12 --- /dev/null +++ b/mcp/reclass/classes/system/neutron/control/opencontrail/cluster.yml @@ -0,0 +1,44 @@ +classes: +- service.keepalived.cluster.single +- service.haproxy.proxy.single +- service.neutron.control.cluster +- system.haproxy.proxy.listen.openstack.neutron +parameters: + 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 + neutron: + server: + dns_domain: ${_param:cluster_domain} + database: + host: ${_param:openstack_database_address} + identity: + region: ${_param:openstack_region} + host: ${_param:openstack_control_address} + message_queue: + members: + - host: ${_param:openstack_message_queue_node01_address} + - host: ${_param:openstack_message_queue_node02_address} + - host: ${_param:openstack_message_queue_node03_address} + compute: + host: ${_param:openstack_control_address} + region: ${_param:openstack_region} + backend: + engine: contrail + host: ${_param:opencontrail_control_address} + port: 8082 + user: admin + password: ${_param:keystone_admin_password} + tenant: admin + token: ${_param:keystone_service_token} \ No newline at end of file diff --git a/mcp/reclass/classes/system/neutron/control/openvswitch/cluster.yml b/mcp/reclass/classes/system/neutron/control/openvswitch/cluster.yml new file mode 100644 index 000000000..dc8e0c53f --- /dev/null +++ b/mcp/reclass/classes/system/neutron/control/openvswitch/cluster.yml @@ -0,0 +1,71 @@ +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 new file mode 100644 index 000000000..f7191c772 --- /dev/null +++ b/mcp/reclass/classes/system/neutron/control/openvswitch/dpdk.yml @@ -0,0 +1,4 @@ +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 new file mode 100644 index 000000000..6601db1e9 --- /dev/null +++ b/mcp/reclass/classes/system/neutron/control/openvswitch/single.yml @@ -0,0 +1,45 @@ +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 new file mode 100644 index 000000000..38f5d29b0 --- /dev/null +++ b/mcp/reclass/classes/system/neutron/control/openvswitch/sriov.yml @@ -0,0 +1,7 @@ +parameters: + neutron: + server: + backend: + mechanism: + sriov: + driver: sriovnicswitch diff --git a/mcp/reclass/classes/system/neutron/control/single.yml b/mcp/reclass/classes/system/neutron/control/single.yml new file mode 100644 index 000000000..663ec329e --- /dev/null +++ b/mcp/reclass/classes/system/neutron/control/single.yml @@ -0,0 +1,22 @@ +classes: +- service.neutron.control.single +parameters: + neutron: + server: + database: + host: ${_param:single_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:single_address} + rights: all + diff --git a/mcp/reclass/classes/system/neutron/gateway/cluster.yml b/mcp/reclass/classes/system/neutron/gateway/cluster.yml new file mode 100644 index 000000000..99699f7d8 --- /dev/null +++ b/mcp/reclass/classes/system/neutron/gateway/cluster.yml @@ -0,0 +1,14 @@ +classes: +- service.neutron.gateway.single +parameters: + neutron: + gateway: + dvr: ${_param:neutron_gateway_dvr} + agent_mode: ${_param:neutron_gateway_agent_mode} + backend: + tenant_network_types: ${_param:neutron_tenant_network_types}" + message_queue: + members: + - host: ${_param:openstack_message_queue_node01_address} + - host: ${_param:openstack_message_queue_node02_address} + - host: ${_param:openstack_message_queue_node03_address} diff --git a/mcp/reclass/classes/system/neutron/gateway/notification/messagingv2.yml b/mcp/reclass/classes/system/neutron/gateway/notification/messagingv2.yml new file mode 100644 index 000000000..6363c3927 --- /dev/null +++ b/mcp/reclass/classes/system/neutron/gateway/notification/messagingv2.yml @@ -0,0 +1,6 @@ +parameters: + neutron: + gateway: + notification: + driver: messagingv2 + topics: "${_param:openstack_notification_topics}" -- cgit 1.2.3-korg