X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fcontroller.yaml;h=ae1ef49ab19d16250dda05f2c6dab2513cea8b69;hb=749d24ec9d6d6c3d0198a287bd7adebca263d7b3;hp=c445ec03289103f5492c9bf30a2a955771725f46;hpb=2059931c70b8968eccf2a58de48623503b22095b;p=apex-tripleo-heat-templates.git

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index c445ec03..ae1ef49a 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -284,10 +284,6 @@ parameters:
     description: The password for the nova service and db account, used by nova-api.
     type: string
     hidden: true
-  NtpServer:
-    default: ''
-    description: Comma-separated list of ntp servers
-    type: comma_delimited_list
   PcsdPassword:
     type: string
     description: The password for the 'pcsd' user.
@@ -694,6 +690,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 ] }
@@ -737,7 +742,6 @@ resources:
         rabbit_cookie: {get_param: RabbitCookie}
         rabbit_client_use_ssl: {get_param: RabbitClientUseSSL}
         rabbit_client_port: {get_param: RabbitClientPort}
-        ntp_servers: {get_param: NtpServer}
         timezone: {get_param: TimeZone}
         control_virtual_interface: {get_param: ControlVirtualInterface}
         public_virtual_interface: {get_param: PublicVirtualInterface}
@@ -820,9 +824,7 @@ resources:
             - neutron_bigswitch_data # Optionally provided by ControllerExtraConfigPre
             - neutron_cisco_data # Optionally provided by ControllerExtraConfigPre
             - cisco_n1kv_data # Optionally provided by ControllerExtraConfigPre
-            - neutron_nuage_data # Optionally provided by ControllerExtraConfigPre
             - midonet_data #Optionally provided by AllNodesExtraConfig
-            - neutron_opencontrail_data # Optionally provided by ControllerExtraConfigPre
           merge_behavior: deeper
           datafiles:
             service_configs:
@@ -962,6 +964,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}
@@ -1054,7 +1057,6 @@ resources:
                 # Misc
                 memcached_ipv6: {get_input: memcached_ipv6}
                 memcached::listen_ip: {get_input: memcached_network}
-                ntp::servers: {get_input: ntp_servers}
                 timezone::timezone: {get_input: timezone}
                 control_virtual_interface: {get_input: control_virtual_interface}
                 public_virtual_interface: {get_input: public_virtual_interface}