Browse Source

Don't install mysql-client-5.5

This version of mysql-client needs to be downloaded from public
repository which introduce additional dependency in case of offline
deployments. I don't see the reason why we require this specific
version, we can relay on the version used by other components.

Change-Id: I5f0a9f621ad4f2a7e6b0dcbd8121e427470023dc
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
Michal Skalski 2 years ago
parent
commit
d445e489e9

+ 0
- 4
deployment_scripts/install_packages.sh View File

@@ -1,4 +0,0 @@
1
-#!/bin/bash
2
-
3
-apt-get install -y mysql-client-5.5
4
-

+ 9
- 5
deployment_scripts/puppet/manifests/db.pp View File

@@ -22,24 +22,28 @@ $allowed_hosts = [ 'localhost', '127.0.0.1', '%' ]
22 22
 validate_string($mysql_root_user)
23 23
 validate_string($database_vip)
24 24
 
25
-class { 'tacker::db::mysql':
25
+class { '::openstack::galera::client':
26
+  custom_setup_class => hiera('mysql_custom_setup_class', 'galera'),
27
+}
28
+
29
+class { '::tacker::db::mysql':
26 30
   user          => $db_user,
27 31
   password      => $db_password,
28 32
   dbname        => $db_name,
29 33
   allowed_hosts => $allowed_hosts,
30 34
 }
31 35
 
32
-class { 'osnailyfacter::mysql_access':
36
+class { '::osnailyfacter::mysql_access':
33 37
   db_host     => $db_host,
34 38
   db_user     => $db_root_user,
35 39
   db_password => $db_root_password,
36 40
 }
37 41
 
38
-Class['osnailyfacter::mysql_access'] ->
39
-  Class['tacker::db::mysql']
42
+Class['::openstack::galera::client'] ->
43
+Class['::osnailyfacter::mysql_access'] ->
44
+  Class['::tacker::db::mysql']
40 45
 
41 46
 class mysql::config {}
42 47
 include mysql::config
43 48
 class mysql::server {}
44 49
 include mysql::server
45
-

+ 0
- 10
deployment_tasks.yaml View File

@@ -1,13 +1,3 @@
1
-- id: tacker-db-sql
2
-  role: [primary-controller]
3
-  required_for: [tacker-db]
4
-  requires: [primary-database, database]
5
-  type: shell
6
-  cross-depends:
7
-    - name: /(primary-)?database/
8
-  parameters:
9
-    cmd: bash install_packages.sh
10
-    timeout: 180
11 1
 - id: tacker
12 2
   type: group
13 3
   role: [tacker]

Loading…
Cancel
Save