Add step to ObjectStorage RingBuilder deployment
[apex-tripleo-heat-templates.git] / puppet / controller.yaml
index 04ce1c3..d38a24e 100644 (file)
@@ -1,4 +1,4 @@
-heat_template_version: 2015-10-15
+heat_template_version: 2016-04-08
 
 description: >
   OpenStack controller node configured by Puppet.
@@ -97,6 +97,11 @@ parameters:
     default: 0
     description: Number of workers for Cinder service.
     type: number
+  controllerExtraConfig:
+    default: {}
+    description: |
+      Deprecated. Use ControllerExtraConfig via parameter_defaults instead.
+    type: json
   ControllerExtraConfig:
     default: {}
     description: |
@@ -323,14 +328,6 @@ parameters:
       scripts or be sure to keep 'datacentre' as a mapping network name.
     type: comma_delimited_list
     default: "datacentre:br-ex"
-  NeutronDnsmasqOptions:
-    default: 'dhcp-option-force=26,1400'
-    description: Dnsmasq options for neutron-dhcp-agent. The default value here forces MTU to be set to 1400 to account for the gre tunnel overhead.
-    type: string
-  NeutronEnableDHCPAgent:
-    description: Knob to enable/disable DHCP Agent
-    type: boolean
-    default: true
   NeutronEnableL3Agent:
     description: Knob to enable/disable L3 agent
     type: boolean
@@ -351,10 +348,6 @@ parameters:
     default: 'False'
     description: Whether to enable l3-agent HA
     type: string
-  NeutronDhcpAgentsPerNetwork:
-    type: number
-    default: 3
-    description: The number of neutron dhcp agents to schedule per network
   NeutronDVR:
     default: 'False'
     description: Whether to configure Neutron Distributed Virtual Routers
@@ -389,10 +382,6 @@ parameters:
     default: 'True'
     description: Allow automatic l3-agent failover
     type: string
-  NeutronEnableIsolatedMetadata:
-    default: 'False'
-    description: If True, DHCP provide metadata route to VM.
-    type: string
   NeutronEnableTunnelling:
     type: string
     default: "True"
@@ -709,6 +698,12 @@ parameters:
     type: json
     default: {}
 
+parameter_groups:
+- label: deprecated
+  description: Do not use deprecated params, they will be removed.
+  parameters:
+  - controllerExtraConfig
+
 resources:
 
   Controller:
@@ -875,7 +870,6 @@ resources:
         swift_workers: {get_param: SwiftWorkers}
         neutron_enable_tunneling: {get_param: NeutronEnableTunnelling}
         neutron_enable_l2pop: {get_param: NeutronEnableL2Pop}
-        neutron_enable_isolated_metadata: {get_param: NeutronEnableIsolatedMetadata}
         haproxy_log_address: {get_param: HAProxySyslogAddress}
         haproxy_stats_password: {get_param: HAProxyStatsPassword}
         haproxy_stats_user: {get_param: HAProxyStatsUser}
@@ -897,6 +891,9 @@ resources:
             - - '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}
@@ -926,6 +923,12 @@ resources:
               - '@'
               - {get_param: MysqlVirtualIPUri}
               - '/cinder'
+        cinder_public_url: {get_param: [EndpointMap, CinderPublic, uri]}
+        cinder_internal_url: {get_param: [EndpointMap, CinderInternal, uri]}
+        cinder_admin_url: {get_param: [EndpointMap, CinderAdmin, uri]}
+        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:
@@ -973,7 +976,6 @@ resources:
             template: DRIVERS
             params:
               DRIVERS: {get_param: NeutronTypeDrivers}
-        neutron_enable_dhcp_agent: {get_param: NeutronEnableDHCPAgent}
         neutron_enable_l3_agent: {get_param: NeutronEnableL3Agent}
         neutron_enable_metadata_agent: {get_param: NeutronEnableMetadataAgent}
         neutron_enable_ovs_agent: {get_param: NeutronEnableOVSAgent}
@@ -984,7 +986,6 @@ resources:
               MECHANISMS: {get_param: NeutronMechanismDrivers}
         neutron_allow_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
         neutron_l3_ha: {get_param: NeutronL3HA}
-        neutron_dhcp_agents_per_network: {get_param: NeutronDhcpAgentsPerNetwork}
         neutron_network_vlan_ranges:
           str_replace:
             template: RANGES
@@ -1032,7 +1033,6 @@ resources:
               AGENT_EXTENSIONS: {get_param: NeutronAgentExtensions}
         neutron_password: {get_param: NeutronPassword}
         neutron_tenant_mtu: {get_param: NeutronTenantMtu}
-        neutron_dnsmasq_options: {get_param: NeutronDnsmasqOptions}
         neutron_dsn:
           list_join:
             - ''
@@ -1051,6 +1051,9 @@ resources:
         ceilometer_password: {get_param: CeilometerPassword}
         ceilometer_store_events: {get_param: CeilometerStoreEvents}
         aodh_password: {get_param: AodhPassword}
+        aodh_internal_url: { get_param: [ EndpointMap, AodhInternal, uri ] }
+        aodh_public_url: { get_param: [ EndpointMap, AodhPublic, uri ] }
+        aodh_admin_url: { get_param: [ EndpointMap, AodhAdmin, uri ] }
         ceilometer_meter_dispatcher: {get_param: CeilometerMeterDispatcher}
         gnocchi_password: {get_param: GnocchiPassword}
         gnocchi_backend: {get_param: GnocchiBackend}
@@ -1080,6 +1083,11 @@ resources:
               - {get_param: MysqlVirtualIPUri}
               - '/gnocchi'
         gnocchi_internal_url: {get_param: [EndpointMap, GnocchiInternal, uri]}
+        gnocchi_public_url: { get_param: [ EndpointMap, GnocchiPublic, uri ] }
+        gnocchi_admin_url: { get_param: [ EndpointMap, GnocchiAdmin, uri ] }
+        ceilometer_public_url: {get_param: [EndpointMap, CeilometerPublic, uri]}
+        ceilometer_internal_url: {get_param: [EndpointMap, CeilometerInternal, uri]}
+        ceilometer_admin_url: {get_param: [EndpointMap, CeilometerAdmin, uri]}
         snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
         snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
         nova_enable_db_purge: {get_param: NovaEnableDBPurge}
@@ -1105,6 +1113,9 @@ resources:
               - '/nova_api'
         upgrade_level_nova_compute: {get_param: UpgradeLevelNovaCompute}
         instance_name_template: {get_param: InstanceNameTemplate}
+        nova_public_url: {get_param: [EndpointMap, NovaPublic, uri]}
+        nova_internal_url: {get_param: [EndpointMap, NovaInternal, uri]}
+        nova_admin_url: {get_param: [EndpointMap, NovaAdmin, uri]}
         fencing_config: {get_param: FencingConfig}
         pcsd_password: {get_param: PcsdPassword}
         rabbit_username: {get_param: RabbitUserName}
@@ -1127,9 +1138,18 @@ resources:
         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:
             - ''
@@ -1218,7 +1238,10 @@ resources:
             service_configs:
               mapped_data: {get_param: ServiceConfigSettings}
             controller_extraconfig:
-              mapped_data: {get_param: ControllerExtraConfig}
+              mapped_data:
+                map_merge:
+                  - {get_param: controllerExtraConfig}
+                  - {get_param: ControllerExtraConfig}
             extraconfig:
               mapped_data: {get_param: ExtraConfig}
             common:
@@ -1258,6 +1281,14 @@ resources:
                 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}
@@ -1282,10 +1313,20 @@ resources:
                 cinder::glance::glance_api_servers: {get_input: glance_api_servers}
                 cinder_backend_config: {get_input: CinderBackendConfig}
                 cinder::db::mysql::password: {get_input: cinder_password}
+                cinder::keystone::auth::public_url: {get_input: cinder_public_url }
+                cinder::keystone::auth::internal_url: {get_input: cinder_internal_url }
+                cinder::keystone::auth::admin_url: {get_input: cinder_admin_url }
+                cinder::keystone::auth::public_url_v2: {get_input: cinder_public_url_v2 }
+                cinder::keystone::auth::internal_url_v2: {get_input: cinder_internal_url_v2 }
+                cinder::keystone::auth::admin_url_v2: {get_input: cinder_admin_url_v2 }
+                cinder::keystone::auth::password: {get_input: cinder_password }
+                cinder::keystone::auth::region: {get_input: keystone_region}
 
                 # Glance
                 glance::api::bind_host: {get_input: glance_api_network}
                 glance::registry::bind_host: {get_input: glance_registry_network}
+                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}
@@ -1312,6 +1353,12 @@ resources:
                 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}
+
                 # Keystone
                 keystone::admin_bind_host: {get_input: keystone_admin_api_network}
                 keystone::public_bind_host: {get_input: keystone_public_api_network}
@@ -1335,11 +1382,6 @@ resources:
 
                 # Neutron
                 neutron::bind_host: {get_input: neutron_api_network}
-                neutron::rabbit_password: {get_input: rabbit_password}
-                neutron::rabbit_user: {get_input: rabbit_username}
-                neutron::rabbit_use_ssl: {get_input: rabbit_client_use_ssl}
-                neutron::rabbit_port: {get_input: rabbit_client_port}
-                neutron::debug: {get_input: debug}
                 neutron::server::auth_uri: {get_input: keystone_auth_uri}
                 neutron::server::identity_uri: {get_input: keystone_identity_uri}
                 neutron::server::database_connection: {get_input: neutron_dsn}
@@ -1348,7 +1390,6 @@ resources:
                 neutron::network_device_mtu: {get_input: neutron_tenant_mtu}
                 neutron::agents::ml2::ovs::enable_tunneling: {get_input: neutron_enable_tunneling}
                 neutron::agents::ml2::ovs::l2_population: {get_input: neutron_enable_l2pop}
-                neutron::agents::dhcp::enable_isolated_metadata: {get_input: neutron_enable_isolated_metadata}
                 neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip}
                 neutron::plugins::ml2::flat_networks: {get_input: neutron_flat_networks}
                 neutron::agents::metadata::shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
@@ -1358,7 +1399,6 @@ resources:
                 neutron_router_distributed: {get_input: neutron_router_distributed}
                 neutron::core_plugin: {get_input: neutron_core_plugin}
                 neutron::service_plugins: {get_input: neutron_service_plugins}
-                neutron::enable_dhcp_agent: {get_input: neutron_enable_dhcp_agent}
                 neutron::enable_l3_agent: {get_input: neutron_enable_l3_agent}
                 neutron::enable_metadata_agent: {get_input: neutron_enable_metadata_agent}
                 neutron::enable_ovs_agent: {get_input: neutron_enable_ovs_agent}
@@ -1367,7 +1407,6 @@ resources:
                 neutron::plugins::ml2::extension_drivers: {get_input: neutron_plugin_extensions}
                 neutron::server::allow_automatic_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
                 neutron::server::l3_ha: {get_input: neutron_l3_ha}
-                neutron::dhcp_agents_per_network: {get_input: neutron_dhcp_agents_per_network}
                 neutron::plugins::ml2::network_vlan_ranges: {get_input: neutron_network_vlan_ranges}
                 neutron::plugins::ml2::tunnel_id_ranges: {get_input: neutron_tunnel_id_ranges}
                 neutron::plugins::ml2::vni_ranges: {get_input: neutron_vni_ranges}
@@ -1381,7 +1420,6 @@ resources:
                 neutron::agents::ml2::ovs::extensions: {get_input: neutron_agent_extensions}
                 neutron::server::auth_password: {get_input: neutron_password}
                 neutron::agents::metadata::auth_password: {get_input: neutron_password}
-                neutron_dnsmasq_options: {get_input: neutron_dnsmasq_options}
                 neutron_dsn: {get_input: neutron_dsn}
                 neutron::agents::metadata::auth_url: {get_input: keystone_identity_uri}
                 neutron::db::mysql::password: {get_input: neutron_password}
@@ -1419,6 +1457,11 @@ resources:
                 ceilometer::dispatcher::gnocchi::filter_project: 'service'
                 ceilometer::dispatcher::gnocchi::archive_policy: 'low'
                 ceilometer::dispatcher::gnocchi::resources_definition_file: 'gnocchi_resources.yaml'
+                ceilometer::keystone::auth::public_url: {get_input: ceilometer_public_url }
+                ceilometer::keystone::auth::internal_url: {get_input: ceilometer_internal_url }
+                ceilometer::keystone::auth::admin_url: {get_input: ceilometer_admin_url }
+                ceilometer::keystone::auth::password: {get_input: ceilometer_password }
+                ceilometer::keystone::auth::region: {get_input: keystone_region}
                 snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
                 snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}
 
@@ -1439,6 +1482,11 @@ resources:
                 aodh::db::mysql::password: {get_input: aodh_password}
                 # for a migration path from ceilometer-alarm to aodh, we use the same database & coordination
                 aodh::evaluator::coordination_url: {get_input: ceilometer_coordination_url}
+                aodh::keystone::auth::public_url: {get_input: aodh_public_url }
+                aodh::keystone::auth::internal_url: {get_input: aodh_internal_url }
+                aodh::keystone::auth::admin_url: {get_input: aodh_admin_url }
+                aodh::keystone::auth::password: {get_input: aodh_password }
+                aodh::keystone::auth::region: {get_input: keystone_region}
 
                 # Gnocchi
                 gnocchi_backend: {get_input: gnocchi_backend}
@@ -1455,6 +1503,11 @@ resources:
                 gnocchi::db::mysql::password: {get_input: gnocchi_password}
                 gnocchi::storage::swift::swift_authurl: {get_input: keystone_auth_uri}
                 gnocchi::storage::swift::swift_key: {get_input: gnocchi_password}
+                gnocchi::keystone::auth::public_url: {get_input: gnocchi_public_url }
+                gnocchi::keystone::auth::internal_url: {get_input: gnocchi_internal_url }
+                gnocchi::keystone::auth::admin_url: {get_input: gnocchi_admin_url }
+                gnocchi::keystone::auth::password: {get_input: gnocchi_password }
+                gnocchi::keystone::auth::region: {get_input: keystone_region}
 
                 # Nova
                 nova::rabbit_userid: {get_input: rabbit_username}
@@ -1470,7 +1523,6 @@ resources:
                 nova::api::metadata_listen: {get_input: nova_metadata_network}
                 nova::api::admin_password: {get_input: nova_password}
                 nova::api::osapi_compute_workers: {get_input: nova_workers}
-                nova::api::ec2_workers: {get_input: nova_workers}
                 nova::api::metadata_workers: {get_input: nova_workers}
                 nova::compute::network_device_mtu: {get_input: neutron_tenant_mtu}
                 nova::database_connection: {get_input: nova_dsn}
@@ -1485,6 +1537,11 @@ resources:
                 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}
+                nova::keystone::auth::admin_url: {get_input: nova_admin_url}
+                nova::keystone::auth::password: {get_input: nova_password }
+                nova::keystone::auth::region: {get_input: keystone_region}
 
                 # Horizon
                 apache::mod::remoteip::proxy_ips: {get_input: horizon_subnet}
@@ -1517,6 +1574,11 @@ resources:
                 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}
 
                 # Rabbit
                 rabbitmq::node_ip_address: {get_input: rabbitmq_network}