diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-21 12:51:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-21 12:51:15 +0000 |
| commit | a5399e2310e666ba5489aeccd56e810108e79d96 (patch) | |
| tree | c8608f1c78b86473b232fbb7610d272f44a446f7 /puppet/controller.yaml | |
| parent | 2059931c70b8968eccf2a58de48623503b22095b (diff) | |
| parent | 8ac333b00467f0ac77b256e908b95173b1fb45bd (diff) | |
Merge "Change Aodh to use own backend"
Diffstat (limited to 'puppet/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index c445ec03..516a9ee8 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -694,6 +694,15 @@ resources: - '@' - {get_param: [EndpointMap, MysqlInternal, host]} - '/gnocchi' + aodh_dsn: + list_join: + - '' + - - {get_param: [EndpointMap, MysqlInternal, protocol]} + - '://aodh:' + - {get_param: AodhPassword} + - '@' + - {get_param: [EndpointMap, MysqlInternal, host]} + - '/aodh' gnocchi_internal_url: {get_param: [EndpointMap, GnocchiInternal, uri]} gnocchi_public_url: { get_param: [ EndpointMap, GnocchiPublic, uri ] } gnocchi_admin_url: { get_param: [ EndpointMap, GnocchiAdmin, uri ] } @@ -962,6 +971,7 @@ resources: snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password} # Aodh + aodh_mysql_conn_string: {get_input: aodh_dsn} aodh::rabbit_userid: {get_input: rabbit_username} aodh::rabbit_password: {get_input: rabbit_password} aodh::rabbit_use_ssl: {get_input: rabbit_client_use_ssl} |