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>
This commit is contained in:
Michal Skalski 2016-09-30 00:10:57 +02:00
parent 3d25978a81
commit d445e489e9
3 changed files with 9 additions and 19 deletions

View File

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

View File

@ -22,24 +22,28 @@ $allowed_hosts = [ 'localhost', '127.0.0.1', '%' ]
validate_string($mysql_root_user)
validate_string($database_vip)
class { 'tacker::db::mysql':
class { '::openstack::galera::client':
custom_setup_class => hiera('mysql_custom_setup_class', 'galera'),
}
class { '::tacker::db::mysql':
user => $db_user,
password => $db_password,
dbname => $db_name,
allowed_hosts => $allowed_hosts,
}
class { 'osnailyfacter::mysql_access':
class { '::osnailyfacter::mysql_access':
db_host => $db_host,
db_user => $db_root_user,
db_password => $db_root_password,
}
Class['osnailyfacter::mysql_access'] ->
Class['tacker::db::mysql']
Class['::openstack::galera::client'] ->
Class['::osnailyfacter::mysql_access'] ->
Class['::tacker::db::mysql']
class mysql::config {}
include mysql::config
class mysql::server {}
include mysql::server

View File

@ -1,13 +1,3 @@
- id: tacker-db-sql
role: [primary-controller]
required_for: [tacker-db]
requires: [primary-database, database]
type: shell
cross-depends:
- name: /(primary-)?database/
parameters:
cmd: bash install_packages.sh
timeout: 180
- id: tacker
type: group
role: [tacker]