diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2016-06-29 12:55:29 +0200 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2016-07-09 04:32:29 +0000 |
| commit | bbe72038e21a2722c194f27f9b98be0649390519 (patch) | |
| tree | 9ebf9b3625ffc19c3e13082ceab89c334a8d0b11 | |
| parent | dd38017922e9589f8d68b232c9a4ae21797e67f5 (diff) | |
Move cinder::db data within service template
Change-Id: I2aaf30289cc792e8860ca9c962d80baf7e804cbf
| -rw-r--r-- | puppet/hieradata/database.yaml | 8 | ||||
| -rw-r--r-- | puppet/services/cinder-base.yaml | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/puppet/hieradata/database.yaml b/puppet/hieradata/database.yaml index a100ae39..471e597f 100644 --- a/puppet/hieradata/database.yaml +++ b/puppet/hieradata/database.yaml @@ -21,14 +21,6 @@ neutron::db::mysql::allowed_hosts: - '%' - "%{hiera('mysql_bind_host')}" -# Cinder -cinder::db::mysql::user: cinder -cinder::db::mysql::host: "%{hiera('mysql_virtual_ip')}" -cinder::db::mysql::dbname: cinder -cinder::db::mysql::allowed_hosts: - - '%' - - "%{hiera('mysql_bind_host')}" - # Heat heat::db::mysql::user: heat heat::db::mysql::host: "%{hiera('mysql_virtual_ip')}" diff --git a/puppet/services/cinder-base.yaml b/puppet/services/cinder-base.yaml index 85682448..f6d2b645 100644 --- a/puppet/services/cinder-base.yaml +++ b/puppet/services/cinder-base.yaml @@ -56,3 +56,9 @@ outputs: cinder::rabbit_userid: {get_param: RabbitUserName} cinder::rabbit_password: {get_param: RabbitPassword} cinder::rabbit_port: {get_param: RabbitClientPort} + cinder::db::mysql::user: cinder + cinder::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host]} + cinder::db::mysql::dbname: cinder + cinder::db::mysql::allowed_hosts: + - '%' + - "%{hiera('mysql_bind_host')}" |