Wire redis_password to the tripleo module

[apex-tripleo-heat-templates.git] / puppet / controller.yaml

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index bdb124c..2e01c0c 100644 (file)
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -333,6 +333,10 @@ parameters:
     default: false
     description: Whether to manage IPtables rules.
     type: boolean
+  MemcachedIPv6:
+    default: false
+    description: Enable IPv6 features in Memcached.
+    type: boolean
   PurgeFirewallRules:
     default: false
     description: Whether IPtables rules should be purged before setting up the new ones.
@@ -1163,10 +1167,11 @@ resources:
         ceilometer_coordination_url:
           list_join:
             - ''
-            - - 'redis://'
-              - {get_param: RedisVirtualIPUri}
-              - ':6379/?password='
+            - - 'redis://:'
               - {get_param: RedisPassword}
+              - '@'
+              - {get_param: RedisVirtualIPUri}
+              - ':6379/'
         ceilometer_dsn:
           list_join:
             - ''
@@ -1180,6 +1185,7 @@ resources:
         nova_enable_db_purge: {get_param: NovaEnableDBPurge}
         nova_ipv6: {get_param: NovaIPv6}
         corosync_ipv6: {get_param: CorosyncIPv6}
+        memcached_ipv6: {get_param: MemcachedIPv6}
         nova_password: {get_param: NovaPassword}
         nova_dsn:
           list_join:
@@ -1234,7 +1240,7 @@ resources:
               - '/sahara'
         swift_proxy_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftProxyNetwork]}]}
         swift_management_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]}
-        cinder_iscsi_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]}
+        cinder_iscsi_network: {get_attr: [NetIpMap, net_ip_uri_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]}
         cinder_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CinderApiNetwork]}]}
         glance_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
         glance_registry_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, GlanceRegistryNetwork]}]}
@@ -1630,6 +1636,7 @@ resources:
                 tripleo::firewall::manage_firewall: {get_input: manage_firewall}
                 tripleo::firewall::purge_firewall_rules: {get_input: purge_firewall_rules}
                 # Misc
+                memcached_ipv6: {get_input: memcached_ipv6}
                 memcached::listen_ip: {get_input: memcached_network}
                 neutron_public_interface_ip: {get_input: neutron_public_interface_ip}
                 ntp::servers: {get_input: ntp_servers}
@@ -1642,6 +1649,7 @@ resources:
                 tripleo::loadbalancer::service_certificate: {get_attr: [NodeTLSData, deployed_ssl_certificate_path]}
                 tripleo::loadbalancer::haproxy_stats_user: {get_input: haproxy_stats_user}
                 tripleo::loadbalancer::haproxy_stats_password: {get_input: haproxy_stats_password}
+                tripleo::loadbalancer::redis_password: {get_input: redis_password}
                 tripleo::packages::enable_install: {get_input: enable_package_install}
                 tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}