We don't need to set a default for the CephX keys and cluster FSID

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

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 6519a1d..679fd90 100644 (file)
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -250,22 +250,6 @@ parameters:
       in the ring.
     hidden: true
     type: string
-  SwiftMinPartHours:
-    type: number
-    default: 1
-    description: The minimum time (in hours) before a partition in a ring can be moved following a rebalance.
-  SwiftPartPower:
-    default: 10
-    description: Partition Power to use when building Swift rings
-    type: number
-  SwiftRingBuild:
-    default: true
-    description: Whether to manage Swift rings or not
-    type: boolean
-  SwiftReplicas:
-    type: number
-    default: 3
-    description: How many replicas to use in the swift rings.
   UpgradeLevelNovaCompute:
     type: string
     description: Nova Compute upgrade level
@@ -570,24 +554,6 @@ resources:
         corosync_ipv6: {get_param: CorosyncIPv6}
         memcached_ipv6: {get_param: MemcachedIPv6}
         nova_password: {get_param: NovaPassword}
-        nova_dsn:
-          list_join:
-            - ''
-            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
-              - '://nova:'
-              - {get_param: NovaPassword}
-              - '@'
-              - {get_param: [EndpointMap, MysqlInternal, host]}
-              - '/nova'
-        nova_api_dsn:
-          list_join:
-            - ''
-            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
-              - '://nova_api:'
-              - {get_param: NovaPassword}
-              - '@'
-              - {get_param: [EndpointMap, MysqlInternal, host]}
-              - '/nova_api'
         upgrade_level_nova_compute: {get_param: UpgradeLevelNovaCompute}
         instance_name_template: {get_param: InstanceNameTemplate}
         nova_public_url: {get_param: [EndpointMap, NovaPublic, uri]}
@@ -603,10 +569,6 @@ resources:
         control_virtual_interface: {get_param: ControlVirtualInterface}
         public_virtual_interface: {get_param: PublicVirtualInterface}
         swift_hash_suffix: {get_param: SwiftHashSuffix}
-        swift_part_power: {get_param: SwiftPartPower}
-        swift_ring_build: {get_param: SwiftRingBuild}
-        swift_replicas: {get_param: SwiftReplicas}
-        swift_min_part_hours: {get_param: SwiftMinPartHours}
         enable_package_install: {get_param: EnablePackageInstall}
         enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
         swift_proxy_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftProxyNetwork]}]}
@@ -731,10 +693,6 @@ resources:
                 swift::proxy::proxy_local_net_ip: {get_input: swift_proxy_network}
                 swift::storage::all::storage_local_net_ip: {get_input: swift_management_network}
                 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}
 
                 # Cinder
                 tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_address: {get_input: cinder_iscsi_network}
@@ -838,8 +796,6 @@ resources:
                 nova::api::api_bind_address: {get_input: nova_api_network}
                 nova::api::metadata_listen: {get_input: nova_metadata_network}
                 nova::api::admin_password: {get_input: nova_password}
-                nova::database_connection: {get_input: nova_dsn}
-                nova::api_database_connection: {get_input: nova_api_dsn}
                 nova::glance_api_servers: {get_input: glance_api_servers}
                 nova::api::neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
                 nova::api::instance_name_template: {get_input: instance_name_template}
@@ -847,8 +803,6 @@ resources:
                 nova::network::neutron::neutron_url: {get_input: neutron_internal_url}
                 nova::network::neutron::neutron_auth_url: {get_input: neutron_auth_url}
                 nova::vncproxy::host: {get_input: nova_api_network}
-                nova::db::mysql::password: {get_input: nova_password}
-                nova::db::mysql_api::password: {get_input: nova_password}
                 nova_enable_db_purge: {get_input: nova_enable_db_purge}
                 nova::keystone::auth::public_url: {get_input: nova_public_url}
                 nova::keystone::auth::internal_url: {get_input: nova_internal_url}