Template param for what command occ runs
[apex-tripleo-heat-templates.git] / puppet / compute.yaml
index 4c18067..db398f1 100644 (file)
@@ -144,12 +144,6 @@ parameters:
         of VXLAN VNI IDs that are available for tenant network allocation
     default: ["1:4094", ]
     type: comma_delimited_list
-  NeutronPublicInterfaceRawDevice:
-    default: ''
-    type: string
-  NeutronDVR:
-    default: 'False'
-    type: string
   NeutronMetadataProxySharedSecret:
     description: Shared secret to prevent spoofing
     type: string
@@ -191,10 +185,6 @@ parameters:
     default: 'False'
     description: Whether to enable l3-agent HA
     type: string
-  NeutronAgentMode:
-    default: 'dvr_snat'
-    description: Agent mode for the neutron-l3-agent on the controller hosts
-    type: string
   NodeIndex:
     type: number
     default: 0
@@ -243,10 +233,6 @@ parameters:
     default: 'neutron'
     description: The full class name of the security API class
     type: string
-  NtpServer:
-    default: ''
-    description: Comma-separated list of ntp servers
-    type: comma_delimited_list
   RabbitHost:
     type: string
     default: ''  # Has to be here because of the ignored empty value bug
@@ -268,14 +254,6 @@ parameters:
     default: 5672
     description: Set rabbit subscriber port, change this if using SSL
     type: number
-  SnmpdReadonlyUserName:
-    default: ro_snmp_user
-    description: The user name for SNMPd with readonly rights running on all Overcloud nodes
-    type: string
-  SnmpdReadonlyUserPassword:
-    description: The user password for SNMPd with readonly rights running on all Overcloud nodes
-    type: string
-    hidden: true
   UpgradeLevelNovaCompute:
     type: string
     description: Nova Compute upgrade level
@@ -294,10 +272,6 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  TimeZone:
-    default: 'UTC'
-    description: The timezone to be set on compute nodes.
-    type: string
   UpdateIdentifier:
     default: ''
     type: string
@@ -339,11 +313,21 @@ parameters:
     type: json
     description: Optional scheduler hints to pass to nova
     default: {}
+  ServiceConfigSettings:
+    type: json
+    default: {}
+  ConfigCommand:
+    type: string
+    description: Command which will be run whenever configuration data changes
+    default: os-refresh-config
 
 resources:
 
   NovaCompute:
     type: OS::Nova::Server
+    metadata:
+      os-collect-config:
+        command: {get_param: ConfigCommand}
     properties:
       image:
         {get_param: Image}
@@ -430,16 +414,22 @@ resources:
     properties:
       ControlPlaneIp: {get_attr: [NovaCompute, networks, ctlplane, 0]}
       ExternalIp: {get_attr: [ExternalPort, ip_address]}
+      ExternalIpSubnet: {get_attr: [ExternalPort, ip_subnet]}
       ExternalIpUri: {get_attr: [ExternalPort, ip_address_uri]}
       InternalApiIp: {get_attr: [InternalApiPort, ip_address]}
+      InternalApiIpSubnet: {get_attr: [InternalApiPort, ip_subnet]}
       InternalApiIpUri: {get_attr: [InternalApiPort, ip_address_uri]}
       StorageIp: {get_attr: [StoragePort, ip_address]}
+      StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]}
       StorageIpUri: {get_attr: [StoragePort, ip_address_uri]}
       StorageMgmtIp: {get_attr: [StorageMgmtPort, ip_address]}
+      StorageMgmtIpSubnet: {get_attr: [StorageMgmtPort, ip_subnet]}
       StorageMgmtIpUri: {get_attr: [StorageMgmtPort, ip_address_uri]}
       TenantIp: {get_attr: [TenantPort, ip_address]}
+      TenantIpSubnet: {get_attr: [TenantPort, ip_subnet]}
       TenantIpUri: {get_attr: [TenantPort, ip_address_uri]}
       ManagementIp: {get_attr: [ManagementPort, ip_address]}
+      ManagementIpSubnet: {get_attr: [ManagementPort, ip_subnet]}
       ManagementIpUri: {get_attr: [ManagementPort, ip_address_uri]}
 
   NetworkConfig:
@@ -475,12 +465,14 @@ resources:
             - heat_config_%{::deploy_config_name}
             - compute_extraconfig
             - extraconfig
+            - service_configs
             - compute
             - ceph_cluster # provided by CephClusterConfig
             - ceph
             - all_nodes # provided by allNodesConfig
             - '"%{::osfamily}"'
             - common
+            - network
             - neutron_bigswitch_data # Optionally provided by ComputeExtraConfigPre
             - cisco_n1kv_data  # Optionally provided by ComputeExtraConfigPre
             - nova_nuage_data  # Optionally provided by ComputeExtraConfigPre
@@ -488,12 +480,19 @@ resources:
             - neutron_opencontrail_data  # Optionally provided by ComputeExtraConfigPre
           merge_behavior: deeper
           datafiles:
+            service_configs:
+              mapped_data: {get_param: ServiceConfigSettings}
             compute_extraconfig:
               mapped_data: {get_param: NovaComputeExtraConfig}
             extraconfig:
               mapped_data: {get_param: ExtraConfig}
             common:
               raw_data: {get_file: hieradata/common.yaml}
+            network:
+              mapped_data:
+                net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
+                net_ip_subnet_map: {get_attr: [NetIpMap, net_ip_subnet_map]}
+                net_ip_uri_map: {get_attr: [NetIpMap, net_ip_uri_map]}
             ceph:
               raw_data: {get_file: hieradata/ceph.yaml}
             compute:
@@ -508,11 +507,21 @@ resources:
                 nova::rabbit_port: {get_input: rabbit_client_port}
                 nova::upgrade_level_compute: {get_input: upgrade_level_nova_compute}
                 nova_compute_driver: {get_input: nova_compute_driver}
+                # TODO(emilien): move libvirt & migration parameters in libvirt profile
+                # used to deploy libvirt/kvm dependencies:
+                nova::compute::libvirt::services::libvirt_virt_type: {get_input: nova_compute_libvirt_type}
+                # used to configured nova.conf:
                 nova::compute::libvirt::libvirt_virt_type: {get_input: nova_compute_libvirt_type}
                 nova::compute::neutron::libvirt_vif_driver: {get_input: nova_compute_libvirt_vif_driver}
                 nova_api_host: {get_input: nova_api_host}
                 nova::compute::vncproxy_host: {get_input: nova_public_ip}
                 nova::compute::rbd::ephemeral_storage: {get_input: nova_enable_rbd_backend}
+                # TUNNELLED mode provides a security enhancement when using shared storage but is not
+                # supported when not using shared storage.
+                # See https://bugzilla.redhat.com/show_bug.cgi?id=1301986#c12
+                # In future versions of QEMU (2.6, mostly), Dan's native encryption
+                # work will obsolete the need to use TUNNELLED transport mode.
+                nova::migration::live_migration_tunnelled: {get_input: nova_enable_rbd_backend}
                 rbd_persistent_storage: {get_input: cinder_enable_rbd_backend}
                 nova_password: {get_input: nova_password}
                 nova::compute::network_device_mtu: {get_input: neutron_tenant_mtu}
@@ -527,12 +536,10 @@ resources:
                 ceilometer::rabbit_password: {get_input: rabbit_password}
                 ceilometer::rabbit_use_ssl: {get_input: rabbit_client_use_ssl}
                 ceilometer::rabbit_port: {get_input: rabbit_client_port}
-                ceilometer::metering_secret: {get_input: ceilometer_metering_secret}
+                ceilometer::telemetry_secret: {get_input: ceilometer_metering_secret}
                 ceilometer::agent::auth::auth_password: {get_input: ceilometer_password}
                 ceilometer::agent::auth::auth_url: {get_input: ceilometer_agent_auth_url}
                 ceilometer_compute_agent: {get_input: ceilometer_compute_agent}
-                snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
-                snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}
                 nova::glance_api_servers: {get_input: glance_api_servers}
                 neutron::debug: {get_input: debug}
                 neutron::rabbit_password: {get_input: rabbit_password}
@@ -558,18 +565,13 @@ resources:
                 nova::network::neutron::neutron_password: {get_input: neutron_password}
                 nova::network::neutron::neutron_url: {get_input: neutron_internal_url}
                 nova::network::neutron::neutron_auth_url: {get_input: neutron_auth_url}
-                neutron_router_distributed: {get_input: neutron_router_distributed}
-                neutron_agent_mode: {get_input: neutron_agent_mode}
                 neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
                 neutron::core_plugin: {get_input: neutron_core_plugin}
                 neutron::service_plugins: {get_input: neutron_service_plugins}
                 neutron::plugins::ml2::type_drivers: {get_input: neutron_type_drivers}
                 neutron::plugins::ml2::mechanism_drivers: {get_input: neutron_mechanism_drivers}
-                neutron_public_interface_raw_device: {get_input: neutron_public_interface_raw_device}
                 keystone_public_api_virtual_ip: {get_input: keystone_vip}
                 admin_password: {get_input: admin_password}
-                ntp::servers: {get_input: ntp_servers}
-                timezone::timezone: {get_input: timezone}
                 tripleo::packages::enable_install: {get_input: enable_package_install}
                 tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
 
@@ -610,8 +612,6 @@ resources:
         ceilometer_password: {get_param: CeilometerPassword}
         ceilometer_compute_agent: {get_param: CeilometerComputeAgent}
         ceilometer_agent_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
-        snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
-        snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
         glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]}
         neutron_flat_networks:
           str_replace:
@@ -656,8 +656,6 @@ resources:
         neutron_physical_bridge: {get_param: NeutronPhysicalBridge}
         neutron_public_interface: {get_param: NeutronPublicInterface}
         neutron_password: {get_param: NeutronPassword}
-        neutron_agent_mode: {get_param: NeutronAgentMode}
-        neutron_router_distributed: {get_param: NeutronDVR}
         neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
         neutron_core_plugin: {get_param: NeutronCorePlugin}
         neutron_service_plugins:
@@ -680,7 +678,6 @@ resources:
             template: AGENT_EXTENSIONS
             params:
               AGENT_EXTENSIONS: {get_param: NeutronAgentExtensions}
-        neutron_public_interface_raw_device: {get_param: NeutronPublicInterfaceRawDevice}
         neutron_internal_url: {get_param: [EndpointMap, NeutronInternal, uri]}
         neutron_auth_url: {get_param: [EndpointMap, KeystoneV3Admin, uri]}
         keystone_vip: {get_param: KeystonePublicApiVirtualIP}
@@ -689,8 +686,6 @@ resources:
         rabbit_password: {get_param: RabbitPassword}
         rabbit_client_use_ssl: {get_param: RabbitClientUseSSL}
         rabbit_client_port: {get_param: RabbitClientPort}
-        ntp_servers: {get_param: NtpServer}
-        timezone: {get_param: TimeZone}
         enable_package_install: {get_param: EnablePackageInstall}
         enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}