diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-08-26 12:41:53 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-08-30 08:59:07 -0400 |
| commit | e3cb92a5db51eb80d0806a9bf42b689756a4ac9f (patch) | |
| tree | 770d11ce23f6830cf63fd802e1b59c3c902fb4d5 /puppet/services/nova-base.yaml | |
| parent | a02cee9e3ba1311c5782365914ca0758ff413dec (diff) | |
Mv Nova, Neutron, Horizon out of controller.yaml
This patch moves the settings for Nova, Neutron, and Horizon
out of controller.yaml.
Also fixes the NovaPassword settings in nova-base.yaml
so they don't use get_input.
Also, creates a new apache.yaml base service to contain shared
apache settings for several services which use Apache for WSGI.
Co-Authored-By: Giulio Fidente <gfidente@redhat.com>
Change-Id: I35d909bd5abc23976b5732a2b9af31cf1448838e
Related-bug: #1604414
Diffstat (limited to 'puppet/services/nova-base.yaml')
| -rw-r--r-- | puppet/services/nova-base.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml index 471ece34..24a63bb4 100644 --- a/puppet/services/nova-base.yaml +++ b/puppet/services/nova-base.yaml @@ -95,14 +95,14 @@ outputs: - '@' - {get_param: [EndpointMap, MysqlInternal, host]} - '/nova_api' - nova::db::mysql::password: {get_input: nova_password} + nova::db::mysql::password: {get_param: NovaPassword} nova::db::mysql::user: nova nova::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]} nova::db::mysql::dbname: nova nova::db::mysql::allowed_hosts: - '%' - "%{hiera('mysql_bind_host')}" - nova::db::mysql_api::password: {get_input: nova_password} + nova::db::mysql_api::password: {get_param: NovaPassword} nova::db::mysql_api::user: nova_api nova::db::mysql_api::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]} nova::db::mysql_api::dbname: nova_api |