Browse Source

Basic structure + DB + Client support

Émilien Macchi 6 years ago
parent
commit
b63a40b030
9 changed files with 374 additions and 2 deletions
  1. 13
    0
      Gemfile
  2. 174
    0
      LICENSE
  3. 13
    0
      Modulefile
  4. 10
    2
      README
  5. 1
    0
      Rakefile
  6. 19
    0
      manifests/client.pp
  7. 58
    0
      manifests/db.pp
  8. 56
    0
      manifests/db/mysql.pp
  9. 30
    0
      manifests/db/mysql/host_access.pp

+ 13
- 0
Gemfile View File

@@ -0,0 +1,13 @@
1
+source :rubygems
2
+
3
+group :development, :test do
4
+  gem 'puppetlabs_spec_helper', :require => false
5
+end
6
+
7
+if puppetversion = ENV['PUPPET_GEM_VERSION']
8
+  gem 'puppet', puppetversion, :require => false
9
+else
10
+  gem 'puppet', :require => false
11
+end
12
+
13
+# vim:ft=ruby

+ 174
- 0
LICENSE View File

@@ -0,0 +1,174 @@
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.

+ 13
- 0
Modulefile View File

@@ -0,0 +1,13 @@
1
+name    'enovance-heat'
2
+version '0.0.1'
3
+source 'none'
4
+author 'enovance'
5
+license 'Apache License, Version 2.0'
6
+summary 'Install/configure Openstack Heat'
7
+description 'Install/configure Openstack Heat'
8
+project_page 'https://launchpad.net/Heat'
9
+
10
+# Dependencies
11
+dependency 'puppetlabs/stdlib', '>= 3.2.0'
12
+dependency 'cprice404/inifile', '>= 0.9.0'
13
+dependency 'puppetlabs/mysql', '>= 0.5.0'

+ 10
- 2
README View File

@@ -1,8 +1,16 @@
1 1
 puppet-heat
2
+This is the Heat module.
2 3
 
3
-WORK IN PROGRESS
4
+WORK IN PROGRESS :
5
+
6
+✓ Basic structure
7
+✓ DB
8
+✓ Client
9
+✗ Heat-API
10
+✗ Heat-API-CFN
11
+✗ Heat-API-CW
12
+✗Heat-Engine
4 13
 
5
-This is the Heat module.
6 14
 
7 15
 License
8 16
 -------

+ 1
- 0
Rakefile View File

@@ -0,0 +1 @@
1
+require 'puppetlabs_spec_helper/rake_tasks'

+ 19
- 0
manifests/client.pp View File

@@ -0,0 +1,19 @@
1
+#
2
+# Installs the heat python library.
3
+#
4
+# == parameters
5
+#  [*ensure*]
6
+#    ensure state for pachage.
7
+#
8
+class heat::client (
9
+  $ensure = 'present'
10
+) {
11
+
12
+  include heat::params
13
+
14
+  package { 'python-heatclient':
15
+    ensure => $ensure,
16
+    name   => $::heat::params::client_package_name,
17
+  }
18
+
19
+}

+ 58
- 0
manifests/db.pp View File

@@ -0,0 +1,58 @@
1
+# Configures the heat database
2
+# This class will install the required libraries depending on the driver
3
+# specified in the connection_string parameter
4
+#
5
+# == Parameters
6
+#  [*database_connection*]
7
+#    the connection string. format: [driver]://[user]:[password]@[host]/[database]
8
+#
9
+class heat::db (
10
+  $database_connection = 'mysql://heat:heat@localhost/heat'
11
+) {
12
+
13
+  include heat::params
14
+
15
+  Package<| title == 'heat-common' |> -> Class['heat::db']
16
+
17
+  validate_re($database_connection,
18
+    '(sqlite|mysql|posgres):\/\/(\S+:\S+@\S+\/\S+)?')
19
+
20
+  case $database_connection {
21
+    /^mysql:\/\//: {
22
+      $backend_package = false
23
+      include mysql::python
24
+    }
25
+    /^postgres:\/\//: {
26
+      $backend_package = 'python-psycopg2'
27
+    }
28
+    /^sqlite:\/\//: {
29
+      $backend_package = 'python-pysqlite2'
30
+    }
31
+    default: {
32
+      fail('Unsupported backend configured')
33
+    }
34
+  }
35
+
36
+  if $backend_package and !defined(Package[$backend_package]) {
37
+    package {'heat-backend-package':
38
+      ensure => present,
39
+      name   => $backend_package,
40
+    }
41
+  }
42
+
43
+  heat_config {
44
+    'DEFAULT/database_connection': value => $database_connection;
45
+  }
46
+
47
+  heat_config['DEFAULT/database_connection'] ~> Exec['heat-dbsync']
48
+
49
+  exec { 'heat-dbsync':
50
+    command     => $::heat::params::dbsync_command,
51
+    path        => '/usr/bin',
52
+    user        => $::heat::params::username,
53
+    refreshonly => true,
54
+    logoutput   => on_failure,
55
+    subscribe   => heat_config['DEFAULT/database_connection']
56
+  }
57
+
58
+}

+ 56
- 0
manifests/db/mysql.pp View File

@@ -0,0 +1,56 @@
1
+# The heat::db::mysql class creates a MySQL database for heat.
2
+# It must be used on the MySQL server
3
+#
4
+# == Parameters
5
+#
6
+#  [*password*]
7
+#    password to connect to the database. Mandatory.
8
+#
9
+#  [*dbname*]
10
+#    name of the database. Optional. Defaults to heat.
11
+#
12
+#  [*user*]
13
+#    user to connect to the database. Optional. Defaults to heat.
14
+#
15
+#  [*host*]
16
+#    the default source host user is allowed to connect from.
17
+#    Optional. Defaults to 'localhost'
18
+#
19
+#  [*allowed_hosts*]
20
+#    other hosts the user is allowd to connect from.
21
+#    Optional. Defaults to undef.
22
+#
23
+#  [*charset*]
24
+#    the database charset. Optional. Defaults to 'latin1'
25
+#
26
+class heat::db::mysql(
27
+  $password      = false,
28
+  $dbname        = 'heat',
29
+  $user          = 'heat',
30
+  $host          = 'localhost',
31
+  $allowed_hosts = undef,
32
+  $charset       = 'latin1',
33
+) {
34
+
35
+  validate_string($password)
36
+
37
+  Class['mysql::server'] -> Class['heat::db::mysql']
38
+  Class['heat::db::mysql'] -> Exec<| title == 'heat-dbsync' |>
39
+  Mysql::Db[$dbname] ~> Exec<| title == 'heat-dbsync' |>
40
+
41
+  mysql::db { $dbname:
42
+    user         => $user,
43
+    password     => $password,
44
+    host         => $host,
45
+    charset      => $charset,
46
+    require      => Class['mysql::config'],
47
+  }
48
+
49
+  if $allowed_hosts {
50
+    heat::db::mysql::host_access { $allowed_hosts:
51
+      user      => $user,
52
+      password  => $password,
53
+      database  => $dbname,
54
+    }
55
+  }
56
+}

+ 30
- 0
manifests/db/mysql/host_access.pp View File

@@ -0,0 +1,30 @@
1
+# Allow a user to access the heat database
2
+#
3
+# == Namevar
4
+#  The host to allow
5
+#
6
+# == Parameters
7
+#  [*user*]
8
+#    username to allow
9
+#
10
+#  [*password*]
11
+#    user password
12
+#
13
+#  [*database*]
14
+#    the database name
15
+#
16
+define heat::db::mysql::host_access ($user, $password, $database)  {
17
+
18
+  database_user { "${user}@${name}":
19
+    password_hash => mysql_password($password),
20
+    provider      => 'mysql',
21
+    require       => Database[$database],
22
+  }
23
+
24
+  database_grant { "${user}@${name}/${database}":
25
+    # TODO figure out which privileges to grant.
26
+    privileges => 'all',
27
+    provider   => 'mysql',
28
+    require    => Database_user["${user}@${name}"]
29
+  }
30
+}

Loading…
Cancel
Save