Browse Source

First release, compatibility with Fuel 7.0 - Use nova provider - rework site.pp

Change-Id: Idd7249b0b14081062cca1cb916db6a1740c56f55
Lnic 3 years ago
parent
commit
92bcc1574b

+ 202
- 0
LICENSE View File

@@ -0,0 +1,202 @@
1
+Apache License
2
+                           Version 2.0, January 2004
3
+                        http://www.apache.org/licenses/
4
+
5
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6
+
7
+   1. Definitions.
8
+
9
+      "License" shall mean the terms and conditions for use, reproduction,
10
+      and distribution as defined by Sections 1 through 9 of this document.
11
+
12
+      "Licensor" shall mean the copyright owner or entity authorized by
13
+      the copyright owner that is granting the License.
14
+
15
+      "Legal Entity" shall mean the union of the acting entity and all
16
+      other entities that control, are controlled by, or are under common
17
+      control with that entity. For the purposes of this definition,
18
+      "control" means (i) the power, direct or indirect, to cause the
19
+      direction or management of such entity, whether by contract or
20
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
21
+      outstanding shares, or (iii) beneficial ownership of such entity.
22
+
23
+      "You" (or "Your") shall mean an individual or Legal Entity
24
+      exercising permissions granted by this License.
25
+
26
+      "Source" form shall mean the preferred form for making modifications,
27
+      including but not limited to software source code, documentation
28
+      source, and configuration files.
29
+
30
+      "Object" form shall mean any form resulting from mechanical
31
+      transformation or translation of a Source form, including but
32
+      not limited to compiled object code, generated documentation,
33
+      and conversions to other media types.
34
+
35
+      "Work" shall mean the work of authorship, whether in Source or
36
+      Object form, made available under the License, as indicated by a
37
+      copyright notice that is included in or attached to the work
38
+      (an example is provided in the Appendix below).
39
+
40
+      "Derivative Works" shall mean any work, whether in Source or Object
41
+      form, that is based on (or derived from) the Work and for which the
42
+      editorial revisions, annotations, elaborations, or other modifications
43
+      represent, as a whole, an original work of authorship. For the purposes
44
+      of this License, Derivative Works shall not include works that remain
45
+      separable from, or merely link (or bind by name) to the interfaces of,
46
+      the Work and Derivative Works thereof.
47
+
48
+      "Contribution" shall mean any work of authorship, including
49
+      the original version of the Work and any modifications or additions
50
+      to that Work or Derivative Works thereof, that is intentionally
51
+      submitted to Licensor for inclusion in the Work by the copyright owner
52
+      or by an individual or Legal Entity authorized to submit on behalf of
53
+      the copyright owner. For the purposes of this definition, "submitted"
54
+      means any form of electronic, verbal, or written communication sent
55
+      to the Licensor or its representatives, including but not limited to
56
+      communication on electronic mailing lists, source code control systems,
57
+      and issue tracking systems that are managed by, or on behalf of, the
58
+      Licensor for the purpose of discussing and improving the Work, but
59
+      excluding communication that is conspicuously marked or otherwise
60
+      designated in writing by the copyright owner as "Not a Contribution."
61
+
62
+      "Contributor" shall mean Licensor and any individual or Legal Entity
63
+      on behalf of whom a Contribution has been received by Licensor and
64
+      subsequently incorporated within the Work.
65
+
66
+   2. Grant of Copyright License. Subject to the terms and conditions of
67
+      this License, each Contributor hereby grants to You a perpetual,
68
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69
+      copyright license to reproduce, prepare Derivative Works of,
70
+      publicly display, publicly perform, sublicense, and distribute the
71
+      Work and such Derivative Works in Source or Object form.
72
+
73
+   3. Grant of Patent License. Subject to the terms and conditions of
74
+      this License, each Contributor hereby grants to You a perpetual,
75
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76
+      (except as stated in this section) patent license to make, have made,
77
+      use, offer to sell, sell, import, and otherwise transfer the Work,
78
+      where such license applies only to those patent claims licensable
79
+      by such Contributor that are necessarily infringed by their
80
+      Contribution(s) alone or by combination of their Contribution(s)
81
+      with the Work to which such Contribution(s) was submitted. If You
82
+      institute patent litigation against any entity (including a
83
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
84
+      or a Contribution incorporated within the Work constitutes direct
85
+      or contributory patent infringement, then any patent licenses
86
+      granted to You under this License for that Work shall terminate
87
+      as of the date such litigation is filed.
88
+
89
+   4. Redistribution. You may reproduce and distribute copies of the
90
+      Work or Derivative Works thereof in any medium, with or without
91
+      modifications, and in Source or Object form, provided that You
92
+      meet the following conditions:
93
+
94
+      (a) You must give any other recipients of the Work or
95
+          Derivative Works a copy of this License; and
96
+
97
+      (b) You must cause any modified files to carry prominent notices
98
+          stating that You changed the files; and
99
+
100
+      (c) You must retain, in the Source form of any Derivative Works
101
+          that You distribute, all copyright, patent, trademark, and
102
+          attribution notices from the Source form of the Work,
103
+          excluding those notices that do not pertain to any part of
104
+          the Derivative Works; and
105
+
106
+      (d) If the Work includes a "NOTICE" text file as part of its
107
+          distribution, then any Derivative Works that You distribute must
108
+          include a readable copy of the attribution notices contained
109
+          within such NOTICE file, excluding those notices that do not
110
+          pertain to any part of the Derivative Works, in at least one
111
+          of the following places: within a NOTICE text file distributed
112
+          as part of the Derivative Works; within the Source form or
113
+          documentation, if provided along with the Derivative Works; or,
114
+          within a display generated by the Derivative Works, if and
115
+          wherever such third-party notices normally appear. The contents
116
+          of the NOTICE file are for informational purposes only and
117
+          do not modify the License. You may add Your own attribution
118
+          notices within Derivative Works that You distribute, alongside
119
+          or as an addendum to the NOTICE text from the Work, provided
120
+          that such additional attribution notices cannot be construed
121
+          as modifying the License.
122
+
123
+      You may add Your own copyright statement to Your modifications and
124
+      may provide additional or different license terms and conditions
125
+      for use, reproduction, or distribution of Your modifications, or
126
+      for any such Derivative Works as a whole, provided Your use,
127
+      reproduction, and distribution of the Work otherwise complies with
128
+      the conditions stated in this License.
129
+
130
+   5. Submission of Contributions. Unless You explicitly state otherwise,
131
+      any Contribution intentionally submitted for inclusion in the Work
132
+      by You to the Licensor shall be under the terms and conditions of
133
+      this License, without any additional terms or conditions.
134
+      Notwithstanding the above, nothing herein shall supersede or modify
135
+      the terms of any separate license agreement you may have executed
136
+      with Licensor regarding such Contributions.
137
+
138
+   6. Trademarks. This License does not grant permission to use the trade
139
+      names, trademarks, service marks, or product names of the Licensor,
140
+      except as required for reasonable and customary use in describing the
141
+      origin of the Work and reproducing the content of the NOTICE file.
142
+
143
+   7. Disclaimer of Warranty. Unless required by applicable law or
144
+      agreed to in writing, Licensor provides the Work (and each
145
+      Contributor provides its Contributions) on an "AS IS" BASIS,
146
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147
+      implied, including, without limitation, any warranties or conditions
148
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149
+      PARTICULAR PURPOSE. You are solely responsible for determining the
150
+      appropriateness of using or redistributing the Work and assume any
151
+      risks associated with Your exercise of permissions under this License.
152
+
153
+   8. Limitation of Liability. In no event and under no legal theory,
154
+      whether in tort (including negligence), contract, or otherwise,
155
+      unless required by applicable law (such as deliberate and grossly
156
+      negligent acts) or agreed to in writing, shall any Contributor be
157
+      liable to You for damages, including any direct, indirect, special,
158
+      incidental, or consequential damages of any character arising as a
159
+      result of this License or out of the use or inability to use the
160
+      Work (including but not limited to damages for loss of goodwill,
161
+      work stoppage, computer failure or malfunction, or any and all
162
+      other commercial damages or losses), even if such Contributor
163
+      has been advised of the possibility of such damages.
164
+
165
+   9. Accepting Warranty or Additional Liability. While redistributing
166
+      the Work or Derivative Works thereof, You may choose to offer,
167
+      and charge a fee for, acceptance of support, warranty, indemnity,
168
+      or other liability obligations and/or rights consistent with this
169
+      License. However, in accepting such obligations, You may act only
170
+      on Your own behalf and on Your sole responsibility, not on behalf
171
+      of any other Contributor, and only if You agree to indemnify,
172
+      defend, and hold each Contributor harmless for any liability
173
+      incurred by, or claims asserted against, such Contributor by reason
174
+      of your accepting any such warranty or additional liability.
175
+
176
+   END OF TERMS AND CONDITIONS
177
+
178
+   APPENDIX: How to apply the Apache License to your work.
179
+
180
+      To apply the Apache License to your work, attach the following
181
+      boilerplate notice, with the fields enclosed by brackets "{}"
182
+      replaced with your own identifying information. (Don't include
183
+      the brackets!)  The text should be enclosed in the appropriate
184
+      comment syntax for the file format. We also recommend that a
185
+      file or class name and description of purpose be included on the
186
+      same "printed page" as the copyright notice for easier
187
+      identification within third-party archives.
188
+
189
+   Copyright {yyyy} {name of copyright owner}
190
+
191
+   Licensed under the Apache License, Version 2.0 (the "License");
192
+   you may not use this file except in compliance with the License.
193
+   You may obtain a copy of the License at
194
+
195
+       http://www.apache.org/licenses/LICENSE-2.0
196
+
197
+   Unless required by applicable law or agreed to in writing, software
198
+   distributed under the License is distributed on an "AS IS" BASIS,
199
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200
+   See the License for the specific language governing permissions and
201
+   limitations under the License.
202
+

+ 110
- 0
README.md View File

@@ -0,0 +1,110 @@
1
+Fuel availability-zones plugin for Fuel
2
+=============================
3
+
4
+availability-zones plugin
5
+---------------
6
+
7
+Overview
8
+--------
9
+Openstack can configure availability zones as logical groups for compute nodes, this plugin allow to configure from 1 to 4 availability zones
10
+
11
+This repo contains all necesary files to build availability-zones Fuel plugin.
12
+
13
+Requirements
14
+------------
15
+
16
+| Requirement                      | Version/Comment                                         |
17
+|----------------------------------|---------------------------------------------------------|
18
+| Mirantis Openstack compatibility | 7.0                                                     |
19
+|----------------------------------|---------------------------------------------------------|
20
+
21
+
22
+Recommendations
23
+---------------
24
+
25
+None.
26
+
27
+Limitations
28
+-----------
29
+
30
+Only 4 availability zones can be defined.
31
+Zone's name can't contain white space character / specials characters
32
+Zone members must be defined by their full and correct hostname
33
+
34
+Installation Guide
35
+==================
36
+
37
+availability-zones plugin installation
38
+----------------------------
39
+
40
+1. Clone the fuel-plugin repo from: https://github.com/stackforge/fuel-plugin-availability-zones.git
41
+
42
+    ``git clone``
43
+
44
+2. Install the Fuel Plugin Builder:
45
+
46
+    ``pip install fuel-plugin-builder``
47
+
48
+3. Build availability-zones Fuel plugin:
49
+
50
+   ``fpb --build fuel-plugin-availability-zones/``
51
+
52
+4. The availability-zones-<x.x.x>.rpm file will be created in the plugin folder (fuel-plugin-availability-zones)
53
+
54
+5. Move this file to the Fuel Master node with secure copy (scp):
55
+
56
+   ``scp availability-zones-<x.x.x>.rpm root@:<the_Fuel_Master_node_IP addres>:/tmp``
57
+   ``cd /tmp``
58
+
59
+6. Install the availability-zones plugin:
60
+
61
+   ``fuel plugins --install availability-zones-<x.x.x>.rpm``
62
+
63
+7.  Verify that the plugin is installed correctly:
64
+   ``fuel plugins --list``
65
+
66
+8. Plugin is ready to use and can be enabled on the Settings tab of the Fuel web UI.
67
+
68
+User Guide
69
+==========
70
+
71
+availability-zones plugin configuration
72
+-----------------------------
73
+
74
+1. Create a new environment with the Fuel UI wizard
75
+
76
+2. Add multiples nodes with the "Compute" role.
77
+
78
+3. Click on the settings tab of the Fuel web UI
79
+
80
+4. Scroll down the page, select the "availability-zones plugin" checkbox
81
+   and fill-in the requiered fields
82
+    - Choose the number of availability zone (from 1 to 4)
83
+    - For each zone you can configure the name of it (/!\ no special characters allowed)
84
+	- For each zone you must fill the member list with fqdn of compute node separated by comma
85
+	(eg: node-25.domain.tld,node-26.domain.tld)
86
+
87
+Here is a screenshot of the fields
88
+
89
+![availability-zones fields](./figures/availability-zones-plugin.png "availability-zones-fields")
90
+
91
+Deployment details
92
+------------------
93
+
94
+Create each availability zone
95
+Add host each host to the correct availability zone
96
+If some compute nodes are not present in this custom availability zones,
97
+they will be member of default availability zone (nova, defined by Fuel)
98
+
99
+Known isues
100
+------------
101
+
102
+None
103
+
104
+Release Notes
105
+-------------
106
+
107
+**1.0.0**
108
+
109
+* Initial release of the plugin
110
+

+ 42
- 0
deployment_scripts/puppet/modules/availability_zones/manifests/init.pp View File

@@ -0,0 +1,42 @@
1
+class availability_zones (
2
+$nb_av,
3
+$label_zone_1,
4
+$label_zone_2,
5
+$label_zone_3,
6
+$label_zone_4,
7
+$zone_1,
8
+$zone_2,
9
+$zone_3,
10
+$zone_4,
11
+){
12
+     nova_aggregate { $label_zone_1:
13
+        ensure          => 'present',
14
+        name            => $label_zone_1,
15
+        availability_zone => $label_zone_1,
16
+        hosts           => $zone_1,
17
+      }
18
+  if $nb_av > 1 {
19
+     nova_aggregate { $label_zone_2:
20
+        ensure          => 'present',
21
+        name            => $label_zone_2,
22
+        availability_zone => $label_zone_2,
23
+        hosts           => $zone_2,
24
+      }
25
+  }
26
+  if $nb_av > 2 {
27
+     nova_aggregate { $label_zone_3:
28
+        ensure          => 'present',
29
+        name            => $label_zone_3,
30
+        availability_zone => $label_zone_3,
31
+        hosts           => $zone_3,
32
+      }
33
+   }
34
+  if $nb_av > 3 {
35
+     nova_aggregate { $label_zone_4:
36
+        ensure          => 'present',
37
+        name            => $label_zone_4,
38
+        availability_zone => $label_zone_4,
39
+        hosts           => $zone_4,
40
+      }
41
+  }
42
+}

+ 14
- 0
deployment_scripts/puppet/site.pp View File

@@ -0,0 +1,14 @@
1
+$availability_zone = hiera('availability_zones')
2
+$nb_av = $availability_zone['nb_av']
3
+
4
+class { 'availability_zones':
5
+    nb_av           => $availability_zone['nb_av'],
6
+    label_zone_1    => $availability_zone['label_availability_zones_1'],
7
+    label_zone_2    => $availability_zone['label_availability_zones_2'],
8
+    label_zone_3    => $availability_zone['label_availability_zones_3'],
9
+    label_zone_4    => $availability_zone['label_availability_zones_4'],
10
+    zone_1          => $availability_zone['availability_zones_1'],
11
+    zone_2          => $availability_zone['availability_zones_2'],
12
+    zone_3          => $availability_zone['availability_zones_3'],
13
+    zone_4          => $availability_zone['availability_zones_4'],
14
+}

+ 83
- 0
environment_config.yaml View File

@@ -0,0 +1,83 @@
1
+attributes:
2
+  nb_av:
3
+    type: "select"
4
+    weight: 10
5
+    value: "1"
6
+    label: "Availibility zones"
7
+    description: "Number of availibility zones"
8
+    values:
9
+      - data: "1"
10
+        label: "1"
11
+      - data: "2"
12
+        label: "2"
13
+      - data: "3"
14
+        label: "3"
15
+      - data: "4"
16
+        label: "4"
17
+  label_availability_zones_1:
18
+    label: "Zone 1 name"
19
+    description: "Name of availability zone 1"
20
+    value: "Zone_1"
21
+    weight: 11
22
+    type: "text"
23
+  availability_zones_1:
24
+    value: ""
25
+    label: "Zone 1"
26
+    description: "List of compute node fqdn members of availability zone 1 (comma separated)"
27
+    weight: 12
28
+    type: "text"
29
+  label_availability_zones_2:
30
+    label: "Zone 2 name"
31
+    description: "Name of availability zone 2"
32
+    value: "Zone_2"
33
+    weight: 13
34
+    type: "text"
35
+    restrictions:
36
+      - condition: "settings:availability_zones.nb_av.value != '2' and settings:availability_zones.nb_av.value != '3' and settings:availability_zones.nb_av.value != '4'"
37
+        action: "hide"
38
+  availability_zones_2:
39
+    value: ""
40
+    label: "Zone 2"
41
+    description: "List of compute node fqdn members of availability zone 2 (comma separated)"
42
+    weight: 14
43
+    type: "text"
44
+    restrictions:
45
+      - condition: "settings:availability_zones.nb_av.value != '2' and settings:availability_zones.nb_av.value != '3' and settings:availability_zones.nb_av.value != '4'"
46
+        action: "hide"
47
+  label_availability_zones_3:
48
+    label: "Zone 3 name"
49
+    description: "Name of availability zone 3"
50
+    value: "Zone_3"
51
+    weight: 15
52
+    type: "text"
53
+    restrictions:
54
+      - condition: "settings:availability_zones.nb_av.value != '3' and settings:availability_zones.nb_av.value != '4'"
55
+        action: "hide"
56
+  availability_zones_3:
57
+    value: ""
58
+    label: "Zone 3"
59
+    description: "List of compute node fqdn members of availability zone 3 (comma separated)"
60
+    weight: 16
61
+    type: "text"
62
+    restrictions:
63
+      - condition: "settings:availability_zones.nb_av.value != '3' and settings:availability_zones.nb_av.value != '4'"
64
+        action: "hide"
65
+  label_availability_zones_4:
66
+    label: "Zone 4 name"
67
+    description: "Name of availability zone 4"
68
+    value: "Zone_4"
69
+    weight: 17
70
+    type: "text"
71
+    restrictions:
72
+      - condition: "settings:availability_zones.nb_av.value != '4'"
73
+        action: "hide"
74
+  availability_zones_4:
75
+    value: ""
76
+    label: "Zone 4"
77
+    description: "List of compute node fqdn members of availability zone 4 (comma separated)"
78
+    weight: 18
79
+    type: "text"
80
+    restrictions:
81
+      - condition: "settings:availability_zones.nb_av.value != '4'"
82
+        action: "hide"
83
+

BIN
figures/availability-zones-plugin.png View File


+ 32
- 0
metadata.yaml View File

@@ -0,0 +1,32 @@
1
+# Plugin name
2
+name: availability_zones
3
+title: Availability Zones plugin
4
+# Plugin version
5
+version: 1.0.0
6
+# Description
7
+description: Allow to configure multiple availability zones
8
+# Required fuel version
9
+fuel_version: ['7.0']
10
+# Specify license of your plugin
11
+licenses: ['Apache License Version 2.0']
12
+# Specify author or company name
13
+authors: ['Orange']
14
+# A link to the plugin's page
15
+homepage: 'https://github.com/stackforge/fuel-plugin-availability-zones'
16
+# Specify a group which your plugin implements, possible options:
17
+# network, storage, storage::cinder, storage::glance, hypervisor
18
+groups: ['hypervisor']
19
+# The plugin is compatible with releases in the list
20
+releases:
21
+  - os: ubuntu
22
+    version: 2015.1.0-7.0
23
+    mode: ['ha', 'multinode']
24
+    deployment_scripts_path: deployment_scripts/
25
+    repository_path: repositories/ubuntu
26
+  - os: centos
27
+    version: 2015.1.0-7.0
28
+    mode: ['ha', 'multinode']
29
+    deployment_scripts_path: deployment_scripts/
30
+    repository_path: repositories/centos
31
+# Version of plugin package
32
+package_version: '2.0.0'

+ 4
- 0
pre_build_hook View File

@@ -0,0 +1,4 @@
1
+#!/bin/bash
2
+# Add here any the actions which are required before plugin build
3
+# like packages building, packages downloading from mirrors and so on.
4
+# The script should return 0 if there were no errors.

+ 0
- 0
repositories/centos/.gitkeep View File


+ 0
- 0
repositories/ubuntu/.gitkeep View File


+ 8
- 0
tasks.yaml View File

@@ -0,0 +1,8 @@
1
+# This task is required for primary-controller node
2
+- role: ['primary-controller']
3
+  stage: post_deployment/2000
4
+  type: puppet
5
+  parameters:
6
+    puppet_manifest: puppet/site.pp
7
+    puppet_modules:  "puppet/modules/:/etc/puppet/modules/"
8
+    timeout: 360

Loading…
Cancel
Save