diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-29 10:12:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-29 10:12:44 +0000 |
| commit | 22decf4276c56b58b41ab6523c9a8da41ddeeab6 (patch) | |
| tree | ce122d549bf0593b5b0c8ca6b7eeaf1ead311e76 /puppet/services/neutron-api.yaml | |
| parent | 1b634c21c118a54071abd2bc5181453f3aa8d7a7 (diff) | |
| parent | 7ba552520787860c966900c8c1fd46e2aefd046c (diff) | |
Merge "Move db::mysql into service_config_settings"
Diffstat (limited to 'puppet/services/neutron-api.yaml')
| -rw-r--r-- | puppet/services/neutron-api.yaml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/puppet/services/neutron-api.yaml b/puppet/services/neutron-api.yaml index dca82bc0..3b531ab3 100644 --- a/puppet/services/neutron-api.yaml +++ b/puppet/services/neutron-api.yaml @@ -145,13 +145,6 @@ outputs: neutron::server::notifications::password: {get_param: NovaPassword} neutron::keystone::authtoken::project_name: 'service' neutron::server::sync_db: true - neutron::db::mysql::password: {get_param: NeutronPassword} - neutron::db::mysql::user: neutron - neutron::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]} - neutron::db::mysql::dbname: ovs_neutron - neutron::db::mysql::allowed_hosts: - - '%' - - "%{hiera('mysql_bind_host')}" tripleo.neutron_server.firewall_rules: '114 neutron server': dport: @@ -179,3 +172,11 @@ outputs: neutron::keystone::auth::admin_url: { get_param: [ EndpointMap, NeutronAdmin, uri ] } neutron::keystone::auth::password: {get_param: NeutronPassword} neutron::keystone::auth::region: {get_param: KeystoneRegion} + mysql: + neutron::db::mysql::password: {get_param: NeutronPassword} + neutron::db::mysql::user: neutron + neutron::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]} + neutron::db::mysql::dbname: ovs_neutron + neutron::db::mysql::allowed_hosts: + - '%' + - "%{hiera('mysql_bind_host')}" |