Composable roles within services - Redis
[apex-tripleo-heat-templates.git] / puppet / controller.yaml
index f372476..99613f6 100644 (file)
@@ -15,6 +15,8 @@ parameters:
     description: The password for the aodh services.
     type: string
     hidden: true
+  #TODO(composable Redis): Remove the Redis password param
+  #As is used by ceilometer
   CeilometerApiVirtualIP:
     type: string
     default: ''
@@ -220,14 +222,6 @@ parameters:
     default: /dev/log
     description: Syslog address where HAproxy will send its log
     type: string
-  HeatPassword:
-    description: The password for the Heat service and db account, used by the Heat services.
-    type: string
-    hidden: true
-  HeatStackDomainAdminPassword:
-    description: Password for heat_stack_domain_admin user.
-    type: string
-    hidden: true
   HeatAuthEncryptionKey:
     description: Auth encryption key for heat-engine
     type: string
@@ -236,15 +230,6 @@ parameters:
     default: '*'
     description: A list of IP/Hostname allowed to connect to horizon
     type: comma_delimited_list
-  HeatWorkers:
-    default: 0
-    description: Number of workers for Heat service.
-    type: number
-  HeatEnableDBPurge:
-    type: boolean
-    default: true
-    description: |
-        Whether to create cron job for purging soft deleted rows in the Heat database.
   HorizonSecret:
     description: Secret key for Django
     type: string
@@ -287,11 +272,6 @@ parameters:
   SaharaApiVirtualIP:
     type: string
     default: ''
-  SaharaPassword:
-    default: unset
-    description: The password for the sahara service account, used by sahara-api.
-    type: string
-    hidden: true
   MysqlClusterUniquePart:
     description: A unique identifier of the MySQL cluster the controller is in.
     type: string
@@ -538,8 +518,8 @@ parameters:
     description: Set rabbit subscriber port, change this if using SSL
     type: number
   RedisPassword:
+    description: The password for Redis
     type: string
-    description: The password to access the Redis service
     hidden: true
   RedisVirtualIP:
     type: string
@@ -577,11 +557,6 @@ parameters:
     default: true
     description: Whether to manage Swift rings or not
     type: boolean
-  SwiftPassword:
-    description: The password for the swift service account, used by the swift proxy
-      services.
-    hidden: true
-    type: string
   SwiftProxyVirtualIP:
     type: string
     default: ''
@@ -589,10 +564,6 @@ parameters:
     type: number
     default: 3
     description: How many replicas to use in the swift rings.
-  SwiftWorkers:
-    default: 0
-    description: Number of workers for Swift service.
-    type: number
   TimeZone:
     default: 'UTC'
     description: The timezone to be set on controller nodes.
@@ -613,9 +584,6 @@ parameters:
   MysqlVirtualIP:
     type: string
     default: ''
-  MysqlVirtualIPUri:
-    type: string
-    default: ''
   NeutronApiVirtualIP:
     type: string
     default: ''
@@ -842,38 +810,14 @@ resources:
         bootstack_nodeid: {get_attr: [Controller, name]}
         ceilometer_workers: {get_param: CeilometerWorkers}
         cinder_workers: {get_param: CinderWorkers}
-        heat_workers: {get_param: HeatWorkers}
         nova_workers: {get_param: NovaWorkers}
         neutron_workers: {get_param: NeutronWorkers}
-        swift_workers: {get_param: SwiftWorkers}
         neutron_enable_tunneling: {get_param: NeutronEnableTunnelling}
         neutron_enable_l2pop: {get_param: NeutronEnableL2Pop}
         haproxy_log_address: {get_param: HAProxySyslogAddress}
         haproxy_stats_password: {get_param: HAProxyStatsPassword}
         haproxy_stats_user: {get_param: HAProxyStatsUser}
-        heat.watch_server_url:
-          list_join:
-            - ''
-            - - 'http://'
-              - {get_param: HeatApiVirtualIPUri}
-              - ':8003'
-        heat.metadata_server_url:
-          list_join:
-            - ''
-            - - 'http://'
-              - {get_param: HeatApiVirtualIPUri}
-              - ':8000'
-        heat.waitcondition_server_url:
-          list_join:
-            - ''
-            - - 'http://'
-              - {get_param: HeatApiVirtualIPUri}
-              - ':8000/v1/waitcondition'
-        heat_public_url: {get_param: [EndpointMap, HeatPublic, uri]}
-        heat_internal_url: {get_param: [EndpointMap, HeatInternal, uri]}
-        heat_admin_url: {get_param: [EndpointMap, HeatAdmin, uri]}
         heat_auth_encryption_key: {get_param: HeatAuthEncryptionKey}
-        heat_enable_db_purge: {get_param: HeatEnableDBPurge}
         horizon_allowed_hosts: {get_param: HorizonAllowedHosts}
         horizon_secret: {get_param: HorizonSecret}
         admin_password: {get_param: AdminPassword}
@@ -896,10 +840,11 @@ resources:
         cinder_dsn:
           list_join:
             - ''
-            - - 'mysql+pymysql://cinder:'
+            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+              - '://cinder:'
               - {get_param: CinderPassword}
               - '@'
-              - {get_param: MysqlVirtualIPUri}
+              - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/cinder'
         cinder_public_url: {get_param: [EndpointMap, CinderPublic, uri]}
         cinder_internal_url: {get_param: [EndpointMap, CinderInternal, uri]}
@@ -907,16 +852,6 @@ resources:
         cinder_public_url_v2: {get_param: [EndpointMap, CinderV2Public, uri]}
         cinder_internal_url_v2: {get_param: [EndpointMap, CinderV2Internal, uri]}
         cinder_admin_url_v2: {get_param: [EndpointMap, CinderV2Admin, uri]}
-        heat_password: {get_param: HeatPassword}
-        heat_stack_domain_admin_password: {get_param: HeatStackDomainAdminPassword}
-        heat_dsn:
-          list_join:
-            - ''
-            - - 'mysql+pymysql://heat:'
-              - {get_param: HeatPassword}
-              - '@'
-              - {get_param: MysqlVirtualIPUri}
-              - '/heat'
         keystone_identity_uri: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
         keystone_auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
         keystone_ec2_uri: { get_param: [EndpointMap, KeystoneEC2, uri] }
@@ -1012,10 +947,11 @@ resources:
         neutron_dsn:
           list_join:
             - ''
-            - - 'mysql+pymysql://neutron:'
+            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+              - '://neutron:'
               - {get_param: NeutronPassword}
               - '@'
-              - {get_param: MysqlVirtualIPUri}
+              - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/ovs_neutron?charset=utf8'
         neutron_internal_url: { get_param: [ EndpointMap, NeutronInternal, uri ] }
         neutron_public_url: { get_param: [ EndpointMap, NeutronPublic, uri ] }
@@ -1045,18 +981,20 @@ resources:
         ceilometer_dsn:
           list_join:
             - ''
-            - - 'mysql+pymysql://ceilometer:'
+            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+              - '://ceilometer:'
               - {get_param: CeilometerPassword}
               - '@'
-              - {get_param: MysqlVirtualIPUri}
+              - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/ceilometer'
         gnocchi_dsn:
           list_join:
             - ''
-            - - 'mysql+pymysql://gnocchi:'
+            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+              - '://gnocchi:'
               - {get_param: GnocchiPassword}
               - '@'
-              - {get_param: MysqlVirtualIPUri}
+              - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/gnocchi'
         gnocchi_internal_url: {get_param: [EndpointMap, GnocchiInternal, uri]}
         gnocchi_public_url: { get_param: [ EndpointMap, GnocchiPublic, uri ] }
@@ -1074,18 +1012,20 @@ resources:
         nova_dsn:
           list_join:
             - ''
-            - - 'mysql+pymysql://nova:'
+            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+              - '://nova:'
               - {get_param: NovaPassword}
               - '@'
-              - {get_param: MysqlVirtualIPUri}
+              - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/nova'
         nova_api_dsn:
           list_join:
             - ''
-            - - 'mysql+pymysql://nova_api:'
+            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+              - '://nova_api:'
               - {get_param: NovaPassword}
               - '@'
-              - {get_param: MysqlVirtualIPUri}
+              - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/nova_api'
         upgrade_level_nova_compute: {get_param: UpgradeLevelNovaCompute}
         instance_name_template: {get_param: InstanceNameTemplate}
@@ -1106,32 +1046,13 @@ resources:
         control_virtual_interface: {get_param: ControlVirtualInterface}
         public_virtual_interface: {get_param: PublicVirtualInterface}
         swift_hash_suffix: {get_param: SwiftHashSuffix}
-        swift_password: {get_param: SwiftPassword}
         swift_part_power: {get_param: SwiftPartPower}
         swift_ring_build: {get_param: SwiftRingBuild}
         swift_replicas: {get_param: SwiftReplicas}
         swift_min_part_hours: {get_param: SwiftMinPartHours}
         swift_mount_check: {get_param: SwiftMountCheck}
-        swift_public_url: {get_param: [EndpointMap, SwiftPublic, uri]}
-        swift_internal_url: {get_param: [EndpointMap, SwiftInternal, uri]}
-        swift_admin_url: {get_param: [EndpointMap, SwiftAdmin, uri]}
-        swift_public_url_s3: {get_param: [EndpointMap, SwiftS3Public, uri]}
-        swift_internal_url_s3: {get_param: [EndpointMap, SwiftS3Internal, uri]}
-        swift_admin_url_s3: {get_param: [EndpointMap, SwiftS3Admin, uri]}
         enable_package_install: {get_param: EnablePackageInstall}
         enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
-        sahara_password: {get_param: SaharaPassword}
-        sahara_public_url: {get_param: [EndpointMap, SaharaPublic, uri]}
-        sahara_internal_url: {get_param: [EndpointMap, SaharaInternal, uri]}
-        sahara_admin_url: {get_param: [EndpointMap, SaharaAdmin, uri]}
-        sahara_dsn:
-          list_join:
-            - ''
-            - - 'mysql://sahara:'
-              - {get_param: SaharaPassword}
-              - '@'
-              - {get_param: MysqlVirtualIPUri}
-              - '/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:
@@ -1163,7 +1084,6 @@ resources:
               SUBNET: {get_attr: [NetIpMap, net_ip_subnet_map, {get_param: [ServiceNetMap, HorizonNetwork]}]}
         rabbitmq_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, RabbitMqNetwork]}]}
         redis_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, RedisNetwork]}]}
-        redis_password: {get_param: RedisPassword}
         redis_vip: {get_param: RedisVirtualIP}
         sahara_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SaharaApiNetwork]}]}
         memcached_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MemcachedNetwork]}]}
@@ -1249,26 +1169,15 @@ resources:
                 tripleo::fencing::config: {get_input: fencing_config}
 
                 # Swift
+                # FIXME: need to move proxy_local_net_ip into swift-proxy.yaml
                 swift::proxy::proxy_local_net_ip: {get_input: swift_proxy_network}
-                swift::proxy::authtoken::auth_uri: {get_input: keystone_auth_uri}
-                swift::proxy::authtoken::identity_uri: {get_input: keystone_identity_uri}
                 swift::storage::all::storage_local_net_ip: {get_input: swift_management_network}
-                swift::swift_hash_suffix: {get_input: swift_hash_suffix}
-                swift::proxy::authtoken::admin_password: {get_input: swift_password}
-                swift::proxy::workers: {get_input: swift_workers}
+                swift::swift_hash_path_suffix: {get_input: swift_hash_suffix}
                 tripleo::ringbuilder::build_ring: { get_input: swift_ring_build }
                 tripleo::ringbuilder::part_power: {get_input: swift_part_power}
                 tripleo::ringbuilder::replicas: {get_input: swift_replicas}
                 tripleo::ringbuilder::min_part_hours: {get_input: swift_min_part_hours}
                 swift_mount_check: {get_input: swift_mount_check}
-                swift::keystone::auth::public_url: {get_input: swift_public_url }
-                swift::keystone::auth::internal_url: {get_input: swift_internal_url }
-                swift::keystone::auth::admin_url: {get_input: swift_admin_url }
-                swift::keystone::auth::public_url_s3: {get_input: swift_public_url_v3 }
-                swift::keystone::auth::internal_url_s3: {get_input: swift_internal_url_v3 }
-                swift::keystone::auth::admin_url_s3: {get_input: swift_admin_url_v3 }
-                swift::keystone::auth::password: {get_input: swift_password }
-                swift::keystone::auth::region: {get_input: keystone_region}
 
                 # Cinder
                 cinder_enable_db_purge: {get_input: cinder_enable_db_purge}
@@ -1308,36 +1217,10 @@ resources:
                 glance::keystone::auth::region: {get_input: keystone_region}
 
                 # Heat
-                heat_stack_domain_admin_password: {get_input: heat_stack_domain_admin_password}
-                heat::engine::heat_watch_server_url: {get_input: heat.watch_server_url}
-                heat::engine::heat_metadata_server_url: {get_input: heat.metadata_server_url}
-                heat::engine::heat_waitcondition_server_url: {get_input: heat.waitcondition_server_url}
-                heat::engine::auth_encryption_key: {get_input: heat_auth_encryption_key}
-                heat::rabbit_userid: {get_input: rabbit_username}
-                heat::rabbit_password: {get_input: rabbit_password}
-                heat::rabbit_use_ssl: {get_input: rabbit_client_use_ssl}
-                heat::rabbit_port: {get_input: rabbit_client_port}
-                heat::auth_uri: {get_input: keystone_auth_uri}
-                heat::keystone_ec2_uri: {get_input: keystone_ec2_uri}
-                heat::identity_uri: {get_input: keystone_identity_uri}
-                heat::keystone_password: {get_input: heat_password}
                 heat::api::bind_host: {get_input: heat_api_network}
-                heat::api::workers: {get_input: heat_workers}
                 heat::api_cloudwatch::bind_host: {get_input: heat_api_network}
-                heat::api_cloudwatch::workers: {get_input: heat_workers}
                 heat::api_cfn::bind_host: {get_input: heat_api_network}
-                heat::api_cfn::workers: {get_input: heat_workers}
-                heat::engine::num_engine_workers: {get_input: heat_workers}
-                heat::database_connection: {get_input: heat_dsn}
-                heat::debug: {get_input: debug}
-                heat::db::mysql::password: {get_input: heat_password}
-                heat_enable_db_purge: {get_input: heat_enable_db_purge}
-                heat::keystone::domain::domain_password: {get_input: heat_stack_domain_admin_password}
-                heat::keystone::auth::public_url: {get_input: heat_public_url }
-                heat::keystone::auth::internal_url: {get_input: heat_internal_url }
-                heat::keystone::auth::admin_url: {get_input: heat_admin_url }
-                heat::keystone::auth::password: {get_input: heat_password }
-                heat::keystone::auth::region: {get_input: keystone_region}
+                heat::engine::auth_encryption_key: {get_input: heat_auth_encryption_key}
 
                 # Keystone
                 keystone::admin_bind_host: {get_input: keystone_admin_api_network}
@@ -1364,7 +1247,7 @@ resources:
                 # Neutron
                 neutron::bind_host: {get_input: neutron_api_network}
                 neutron::server::auth_uri: {get_input: keystone_auth_uri}
-                neutron::server::identity_uri: {get_input: keystone_identity_uri}
+                neutron::server::auth_url: {get_input: keystone_identity_uri}
                 neutron::server::database_connection: {get_input: neutron_dsn}
                 neutron::server::api_workers: {get_input: neutron_workers}
                 neutron::network_device_mtu: {get_input: neutron_tenant_mtu}
@@ -1394,7 +1277,7 @@ resources:
                 neutron::plugins::ml2::tenant_network_types: {get_input: neutron_tenant_network_types}
                 neutron::agents::ml2::ovs::tunnel_types: {get_input: neutron_tunnel_types}
                 neutron::agents::ml2::ovs::extensions: {get_input: neutron_agent_extensions}
-                neutron::server::auth_password: {get_input: neutron_password}
+                neutron::server::password: {get_input: neutron_password}
                 neutron_dsn: {get_input: neutron_dsn}
                 neutron::db::mysql::password: {get_input: neutron_password}
                 neutron::keystone::auth::public_url: {get_input: neutron_public_url }
@@ -1402,7 +1285,6 @@ resources:
                 neutron::keystone::auth::admin_url: {get_input: neutron_admin_url }
                 neutron::keystone::auth::password: {get_input: neutron_password }
                 neutron::keystone::auth::region: {get_input: keystone_region}
-                neutron::server::notifications::nova_url: {get_input: nova_internal_url}
                 neutron::server::notifications::auth_url: {get_input: neutron_auth_url}
                 neutron::server::notifications::tenant_name: 'service'
                 neutron::server::notifications::project_name: 'service'
@@ -1411,7 +1293,7 @@ resources:
                 # Ceilometer
                 ceilometer_backend: {get_input: ceilometer_backend}
                 ceilometer_mysql_conn_string: {get_input: ceilometer_dsn}
-                ceilometer::metering_secret: {get_input: ceilometer_metering_secret}
+                ceilometer::telemetry_secret: {get_input: ceilometer_metering_secret}
                 ceilometer::rabbit_userid: {get_input: rabbit_username}
                 ceilometer::rabbit_password: {get_input: rabbit_password}
                 ceilometer::rabbit_use_ssl: {get_input: rabbit_client_use_ssl}
@@ -1419,8 +1301,8 @@ resources:
                 ceilometer::debug: {get_input: debug}
                 ceilometer::api::host: {get_input: ceilometer_api_network}
                 ceilometer::api::keystone_password: {get_input: ceilometer_password}
-                ceilometer::api::keystone_auth_uri: {get_input: keystone_auth_uri}
-                ceilometer::api::keystone_identity_uri: {get_input: keystone_identity_uri}
+                ceilometer::api::auth_uri: {get_input: keystone_auth_uri}
+                ceilometer::api::identity_uri: {get_input: keystone_identity_uri}
                 ceilometer::agent::auth::auth_password: {get_input: ceilometer_password}
                 ceilometer::agent::auth::auth_url: {get_input: keystone_auth_uri}
                 ceilometer::agent::central::coordination_url: {get_input: ceilometer_coordination_url}
@@ -1526,41 +1408,11 @@ resources:
                 horizon::bind_address: {get_input: horizon_network}
                 horizon::keystone_url: {get_input: keystone_auth_uri}
 
-                # Sahara
-                sahara::host: {get_input: sahara_api_network}
-                sahara::plugins:
-                  - cdh
-                  - hdp
-                  - mapr
-                  - vanilla
-                  - spark
-                  - storm
-                sahara::admin_password: {get_input: sahara_password}
-                sahara::auth_uri: {get_input: keystone_auth_uri}
-                sahara::admin_user: sahara
-                sahara::identity_uri: {get_input: keystone_identity_uri}
-                sahara::use_neutron: true
-                sahara::database_connection: {get_input: sahara_dsn}
-                sahara::debug: {get_input: debug}
-                sahara::rpc_backend: rabbit
-                sahara::rabbit_userid: {get_input: rabbit_username}
-                sahara::rabbit_password: {get_input: rabbit_password}
-                sahara::rabbit_use_ssl: {get_input: rabbit_client_use_ssl}
-                sahara::rabbit_port: {get_input: rabbit_client_port}
-                sahara::db::mysql::password: {get_input: sahara_password}
-                sahara::keystone::auth::public_url: {get_input: sahara_public_url }
-                sahara::keystone::auth::internal_url: {get_input: sahara_internal_url }
-                sahara::keystone::auth::admin_url: {get_input: sahara_admin_url }
-                sahara::keystone::auth::password: {get_input: sahara_password }
-                sahara::keystone::auth::region: {get_input: keystone_region}
                 # RabbitMQ
                 rabbitmq::node_ip_address: {get_input: rabbitmq_network}
                 rabbitmq::erlang_cookie: {get_input: rabbit_cookie}
                 # Redis
                 redis::bind: {get_input: redis_network}
-                redis::requirepass: {get_input: redis_password}
-                redis::masterauth: {get_input: redis_password}
-                redis::sentinel_auth_pass: {get_input: redis_password}
                 redis_vip: {get_input: redis_vip}
                 # Firewall
                 tripleo::firewall::manage_firewall: {get_input: manage_firewall}
@@ -1573,13 +1425,15 @@ resources:
                 timezone::timezone: {get_input: timezone}
                 control_virtual_interface: {get_input: control_virtual_interface}
                 public_virtual_interface: {get_input: public_virtual_interface}
-                tripleo::loadbalancer::control_virtual_interface: {get_input: control_virtual_interface}
-                tripleo::loadbalancer::public_virtual_interface: {get_input: public_virtual_interface}
-                tripleo::loadbalancer::haproxy_log_address: {get_input: haproxy_log_address}
-                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::keepalived::control_virtual_interface: {get_input: control_virtual_interface}
+                tripleo::keepalived::public_virtual_interface: {get_input: public_virtual_interface}
+                tripleo::haproxy::control_virtual_interface: {get_input: control_virtual_interface}
+                tripleo::haproxy::public_virtual_interface: {get_input: public_virtual_interface}
+                tripleo::haproxy::haproxy_log_address: {get_input: haproxy_log_address}
+                tripleo::haproxy::service_certificate: {get_attr: [NodeTLSData, deployed_ssl_certificate_path]}
+                tripleo::haproxy::haproxy_stats_user: {get_input: haproxy_stats_user}
+                tripleo::haproxy::haproxy_stats_password: {get_input: haproxy_stats_password}
+                tripleo::haproxy::redis_password: {get_input: redis_password}
                 tripleo::packages::enable_install: {get_input: enable_package_install}
                 tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}