diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..8f71f43 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/README.md b/README.md new file mode 100644 index 0000000..bade2aa --- /dev/null +++ b/README.md @@ -0,0 +1,34 @@ +fuel-plugin-detach-haproxy +========================== + +## Purpose +The main purpose of this plugin is to provide ability to deploy Load Balancer +(Haproxy) separately from controllers. + +## Compatibility + +| Plugin version | Fuel version | +| -------------- | ------------ | +| 1.x.x | Fuel-8.x | +| 2.x.x | Fuel-9.x | + +## How to build plugin + +* Install fuel plugin builder (fpb) +* Clone plugin repo and run fpb there: +``` +git clone https://github.com/openstack/fuel-plugin-detach-haproxy +cd fuel-plugin-detach-haproxy +fpb --build . +``` +* Check if file `detach_haproxy-*.noarch.rpm` was created. + +## Known limitations +* OSTF is not working + +## Configuration + +No need to configure plugin. Just assign `Haproxy` roles to needed nodes. +If you're using it along with [External Load Balancer](https://github.com/openstack/fuel-plugin-external-lb) +plugin for testing purposes, you also don't need to configure External Load +Balancer plugin, it will be configured to use Haproxy nodes automaticaly. diff --git a/deployment_scripts/puppet/manifests/add_to_hiera.pp b/deployment_scripts/puppet/manifests/add_to_hiera.pp new file mode 100644 index 0000000..07c4918 --- /dev/null +++ b/deployment_scripts/puppet/manifests/add_to_hiera.pp @@ -0,0 +1,48 @@ +notice('MODULAR: detach-haproxy/add_to_hiera.pp') + +$plugin_name = 'detach_haproxy' +$network_metadata = hiera_hash('network_metadata', {}) +$haproxy_roles = ['primary-standalone-haproxy', 'standalone-haproxy'] +$haproxy_nodes = get_nodes_hash_by_roles($network_metadata, $haproxy_roles) + +$mgmt_ip = $network_metadata['vips']['haproxy']['ipaddr'] +$public_ip = $network_metadata['vips']['haproxy_public']['ipaddr'] + +if roles_include($haproxy_roles){ + $haproxy = true +} else { + $haproxy = false +} + +file {"/etc/hiera/plugins/${plugin_name}.yaml": + ensure => file, + content => inline_template("# Created by puppet, please do not edit manually +network_metadata: + vips: +<% unless @haproxy -%> + haproxy: + namespace: false + haproxy_public: + namespace: false +<% end -%> + management: + ipaddr: <%= @mgmt_ip %> +<% if @haproxy -%> + namespace: haproxy +<% else -%> + namespace: false +<% end -%> + public: + ipaddr: <%= @public_ip %> +<% if @haproxy -%> + namespace: haproxy +<% else -%> + namespace: false +<% end -%> +<% if @haproxy -%> +corosync_roles: <%= @haproxy_roles %> +<% end -%> +run_ping_checker: false +") +} + diff --git a/deployment_scripts/puppet/manifests/openstack-haproxy-mysqld-status.pp b/deployment_scripts/puppet/manifests/openstack-haproxy-mysqld-status.pp new file mode 100644 index 0000000..9805b52 --- /dev/null +++ b/deployment_scripts/puppet/manifests/openstack-haproxy-mysqld-status.pp @@ -0,0 +1,35 @@ +notice('MODULAR: detach-haproxy/openstack-haproxy-mysqld-status.pp') + +$mysql_hash = hiera_hash('mysql', {}) +$use_mysql = pick($mysql_hash['enabled'], true) +$custom_mysql_setup_class = hiera('custom_mysql_setup_class', 'galera') +$external_lb = hiera('external_lb', false) + +# only do this if mysql is enabled and we are using one of the galera/percona classes +if !$external_lb and $use_mysql and ($custom_mysql_setup_class in ['galera', 'percona', 'percona_packages']) { + $database_address_map = get_node_to_ipaddr_map_by_network_role(hiera_hash('database_nodes'), 'mgmt/database') + $server_names = hiera_array('mysqld_names', keys($database_address_map)) + $ipaddresses = hiera_array('mysqld_ipaddresses', values($database_address_map)) + $public_virtual_ip = hiera('public_vip') + $internal_virtual_ip = hiera('management_vip') + + Openstack::Ha::Haproxy_service { + internal_virtual_ip => $internal_virtual_ip, + ipaddresses => $ipaddresses, + public_virtual_ip => $public_virtual_ip, + server_names => $server_names, + } + + openstack::ha::haproxy_service { 'mysqld-status': + order => '115', + public => true, + listen_port => 49000, + balancermember_port => 49000, + define_backups => false, + haproxy_config_options => { + 'option' => ['httpchk', 'httplog','httpclose'], + 'http-request' => 'set-header X-Forwarded-Proto https if { ssl_fc }', + }, + balancermember_options => 'check port 49000 inter 20s fastinter 2s downinter 2s rise 3 fall 3', + } +} diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml new file mode 100644 index 0000000..8a35136 --- /dev/null +++ b/deployment_tasks.yaml @@ -0,0 +1,96 @@ +- id: primary-standalone-haproxy + type: group + role: [primary-standalone-haproxy] + requires: [deploy_start] + required_for: [deploy_end, standalone-haproxy, primary-controller] + parameters: + strategy: + type: parallel + tasks: + - hiera + - fuel_pkgs + - globals + - tools + - logging + - netconfig + - hosts + - primary-cluster + - virtual_ips + - cluster-haproxy + - openstack-haproxy-ceilometer + - openstack-haproxy-nova + - openstack-haproxy-sahara + - openstack-haproxy-glance + - openstack-haproxy-heat + - openstack-haproxy-cinder + - openstack-haproxy-keystone + - openstack-haproxy-murano + - openstack-haproxy-horizon + - openstack-haproxy-stats + - openstack-haproxy-ironic + - openstack-haproxy-radosgw + - openstack-haproxy-swift + - openstack-haproxy-neutron + - openstack-haproxy-mysqld + - openstack-haproxy + - ssl-keys-saving + - ssl-add-trust-chain + +- id: standalone-haproxy + type: group + role: [standalone-haproxy] + requires: [deploy_start] + required_for: [deploy_end, primary-controller] + parameters: + strategy: + type: parallel + tasks: + - hiera + - fuel_pkgs + - globals + - tools + - logging + - netconfig + - hosts + - cluster + - virtual_ips + - cluster-haproxy + - openstack-haproxy-ceilometer + - openstack-haproxy-nova + - openstack-haproxy-sahara + - openstack-haproxy-glance + - openstack-haproxy-heat + - openstack-haproxy-cinder + - openstack-haproxy-keystone + - openstack-haproxy-murano + - openstack-haproxy-horizon + - openstack-haproxy-stats + - openstack-haproxy-ironic + - openstack-haproxy-radosgw + - openstack-haproxy-swift + - openstack-haproxy-neutron + - openstack-haproxy-mysqld + - openstack-haproxy + - ssl-keys-saving + - ssl-add-trust-chain + +- id: standalone-haproxy-hiera + type: puppet + role: '*' + requires: [pre_hiera_config] + required_for: [pre_deployment_end] + parameters: + puppet_manifest: puppet/manifests/add_to_hiera.pp + puppet_modules: puppet/modules:/etc/puppet/modules + timeout: 120 + +- id: standalone-haproxy-mysqld-status + type: puppet + groups: [primary-standalone-haproxy, standalone-haproxy] + requires: [deploy_start, cluster-haproxy] + required_for: [openstack-haproxy, deploy_end] + parameters: + puppet_manifest: puppet/manifests/openstack-haproxy-mysqld-status.pp + puppet_modules: puppet/modules:/etc/puppet/modules + timeout: 180 + diff --git a/environment_config.yaml b/environment_config.yaml new file mode 100644 index 0000000..88e2791 --- /dev/null +++ b/environment_config.yaml @@ -0,0 +1,3 @@ +attributes: + metadata: + label: "Detach Haproxy Plugin" diff --git a/metadata.yaml b/metadata.yaml new file mode 100644 index 0000000..2274622 --- /dev/null +++ b/metadata.yaml @@ -0,0 +1,23 @@ +name: detach_haproxy +title: Separate Haproxy from Controller +version: 1.1.0 +description: Adds new role for separate Haproxy deployment +fuel_version: ['8.0'] +licenses: ['Apache License, Version 2.0'] +authors: + - 'Aleksandr Didenko ' +homepage: 'https://github.com/adidenko/fuel-plugin-detach-haproxy' +groups: ['network'] +releases: + - os: ubuntu + version: liberty-8.0 + mode: ['ha'] + deployment_scripts_path: deployment_scripts/ + repository_path: repositories/ubuntu + - os: centos + version: liberty-8.0 + mode: ['ha'] + deployment_scripts_path: deployment_scripts/ + repository_path: repositories/centos +package_version: '3.0.0' +is_hotpluggable: false diff --git a/network_roles.yaml b/network_roles.yaml new file mode 100644 index 0000000..14999b8 --- /dev/null +++ b/network_roles.yaml @@ -0,0 +1,34 @@ +# Unique network role name +- id: "detach_haproxy/vip" + # Role mapping to network + default_mapping: "management" + properties: + # Should be true if network role requires subnet being set + subnet: true + # Should be true if network role requires gateway being set + gateway: false + # List of VIPs to be allocated + vip: + - name: "haproxy" + namespace: "haproxy" + alias: "haproxy" + node_roles: + - "primary-standalone-haproxy" + - "standalone-haproxy" +- id: "detach_haproxy_public/vip" + # Role mapping to network + default_mapping: "public" + properties: + # Should be true if network role requires subnet being set + subnet: true + # Should be true if network role requires gateway being set + gateway: false + # List of VIPs to be allocated + vip: + - name: "haproxy_public" + namespace: "haproxy" + alias: "haproxy_public" + node_roles: + - "primary-standalone-haproxy" + - "standalone-haproxy" + diff --git a/node_roles.yaml b/node_roles.yaml new file mode 100644 index 0000000..0030bf5 --- /dev/null +++ b/node_roles.yaml @@ -0,0 +1,13 @@ +standalone-haproxy: + name: 'Haproxy' + description: 'Separated Haproxy from controller' + has_primary: true + public_ip_required: true + weight: 100 + conflicts: + - controller + - compute + limits: + min: 1 + update_required: + - standalone-haproxy diff --git a/repositories/centos/.gitkeep b/repositories/centos/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/repositories/ubuntu/.gitkeep b/repositories/ubuntu/.gitkeep new file mode 100644 index 0000000..e69de29