Add Ceph related templates needed to configure Cinder with Ceph

[apex-tripleo-heat-templates.git] / overcloud-source.yaml

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 3089659..f73206d 100644 (file)
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -116,6 +116,10 @@ parameters:
     description: The filepath of the file to use for logging messages from Glance.
     type: string
     default: ''
+  HorizonPort:
+    type: number
+    default: 80
+    description: Horizon web server port.
   GlancePassword:
     default: unset
     description: The password for the glance service account, used by the glance services.
@@ -151,7 +155,7 @@ parameters:
       the openvswitch agent. Typically should not need to be changed.
     type: string
   HypervisorNeutronPublicInterface:
-    default: 'eth0'
+    default: nic1
     description: What interface to add to the HypervisorNeutronPhysicalBridge.
     type: string
   ImageUpdatePolicy:
@@ -234,7 +238,7 @@ parameters:
     type: string
     hidden: true
   NeutronPublicInterface:
-    default: eth0
+    default: nic1
     description: What interface to bridge onto br-ex for network nodes.
     type: string
   NeutronPublicInterfaceDefaultRoute:
@@ -291,6 +295,10 @@ parameters:
     default: 'True'
     description: Allow automatic l3-agent failover
     type: string
+  NeutronL3HA:
+    default: 'False'
+    description: Whether to enable l3-agent HA
+    type: string
   NovaComputeDriver:
     default: libvirt.LibvirtDriver
     type: string
@@ -317,13 +325,11 @@ parameters:
     type: string
     default: ''
   OvercloudComputeFlavor:
-    default: baremetal
     description: Flavor for compute nodes to request when deploying.
     type: string
     constraints:
       - custom_constraint: nova.flavor
   OvercloudControlFlavor:
-    default: baremetal
     description: Flavor for control nodes to request when deploying.
     type: string
     constraints:
@@ -421,18 +427,6 @@ resources:
         GlanceHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
         RabbitHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
         NovaPublicIP: {get_attr: [PublicVirtualIP, fixed_ips, 0, ip_address]}
-        CeilometerDSN:
-          Fn::Join:
-            - ''
-            - - mysql://ceilometer:unset@
-              - &compute_database_host {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
-              - /ceilometer
-        NeutronDSN:
-          Fn::Join:
-            - ''
-            - - mysql://neutron:unset@
-              - *compute_database_host
-              - /ovs_neutron
         NeutronNetworkType:
             get_param: NeutronNetworkType
         NeutronTunnelTypes:
@@ -458,6 +452,8 @@ resources:
             get_param: NeutronMechanismDrivers
         NeutronAllowL3AgentFailover:
             get_param: NeutronAllowL3AgentFailover
+        NeutronL3HA:
+            get_param: NeutronL3HA
   NovaCompute0AllNodesDeployment:
     type: FileInclude
     Path: nova-compute-instance.yaml
@@ -579,6 +575,7 @@ resources:
           metadata_server_url: {get_input: heat.metadata_server_url}
           waitcondition_server_url: {get_input: heat.waitcondition_server_url}
         horizon:
+          port: {get_param: HorizonPort}
           caches:
             memcached:
               nodes:
@@ -623,6 +620,7 @@ resources:
           router_distributed: {get_param: NeutronDVR}
           mechanism_drivers: {get_param: NeutronMechanismDrivers}
           allow_automatic_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
+          l3_ha: {get_param: NeutronL3HA}
           ovs:
             enable_tunneling: 'True'
             local_ip:
@@ -697,7 +695,7 @@ resources:
           rabbit_port: {get_param: RabbitClientPort}
         ntp:
           servers:
-              - {server: {get_param: NtpServer}, fudge: "stratum 0"}
+              - {server: {get_param: NtpServer}}
         virtual_interfaces:
           instances:
             - vrrp_instance_name: VI_CONTROL
@@ -800,6 +798,7 @@ resources:
               options:
                 - timeout client 0
                 - timeout server 0
+                - maxconn 1500
   controllerPassthrough:
     type: OS::Heat::StructuredConfig
     properties:
@@ -924,6 +923,10 @@ resources:
               - Merge::Map:
                   controller0:
                     {get_attr: [controller0, name]}
+        sysctl:
+          net.ipv4.tcp_keepalive_time: 5
+          net.ipv4.tcp_keepalive_probes: 5
+          net.ipv4.tcp_keepalive_intvl: 1
   controller0SSLDeployment:
     type: OS::Heat::StructuredDeployment
     properties: