Merge "Explicitly set nova and neutron host on controllers"

diff --cc puppet/services/neutron-base.yaml
Simple merge

diff --cc puppet/services/nova-base.yaml
index 99ae520,c67a1d8..c94e024
--- 1/puppet/services/nova-base.yaml
--- 2/puppet/services/nova-base.yaml
+++ b/puppet/services/nova-base.yaml
@@@ -38,44 -29,12 +38,45 @@@ parameters
  
  outputs:
    role_data:
-     description: Role data for the Neutron base service.
+     description: Role data for the Nova base service.
      value:
 +      service_name: nova-base
        config_settings:
          nova::rabbit_password: {get_param: RabbitPassword}
          nova::rabbit_user: {get_param: RabbitUserName}
          nova::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
          nova::rabbit_port: {get_param: RabbitClientPort}
 +        nova::database_connection:
 +          list_join:
 +            - ''
 +            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
 +              - '://nova:'
 +              - {get_param: NovaPassword}
 +              - '@'
 +              - {get_param: [EndpointMap, MysqlInternal, host]}
 +              - '/nova'
 +        nova::api_database_connection:
 +          list_join:
 +            - ''
 +            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
 +              - '://nova_api:'
 +              - {get_param: NovaPassword}
 +              - '@'
 +              - {get_param: [EndpointMap, MysqlInternal, host]}
 +              - '/nova_api'
 +        nova::db::mysql::password: {get_input: nova_password}
 +        nova::db::mysql::user: nova
 +        nova::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]}
 +        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::user: nova_api
 +        nova::db::mysql_api::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]}
 +        nova::db::mysql_api::dbname: nova_api
 +        nova::db::mysql_api::allowed_hosts:
 +          - '%'
 +          - "%{hiera('mysql_bind_host')}"
          nova::debug: {get_param: Debug}
+         nova::host: '"%{::fqdn}"'