Merge "Add parameter to manage usage of Neutron l3_ha option"

diff --combined compute-config.yaml
index 5477e8c,872c9f7..0a863aa
--- 1/compute-config.yaml
--- 2/compute-config.yaml
+++ b/compute-config.yaml
@@@ -50,6 -50,7 +50,7 @@@ resources
            metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
            mechanism_drivers: {get_input: neutron_mechanism_drivers}
            allow_automatic_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
+           l3_ha: {get_input: neutron_l3_ha}
            ovs:
              local_ip: {get_input: neutron_local_ip}
              tenant_network_type: {get_input: neutron_tenant_network_type}
@@@ -68,7 -69,7 +69,7 @@@
            password: {get_input: rabbit_password}
          ntp:
            servers:
 -              - {server: {get_input: ntp_server}, fudge: "stratum 0"}
 +              - {server: {get_input: ntp_server}}
  
  outputs:
    config_id:

diff --combined controller-config.yaml
index fa9db05,b58d20e..30cc5c6
--- 1/controller-config.yaml
--- 2/controller-config.yaml
+++ b/controller-config.yaml
@@@ -87,6 -87,7 +87,7 @@@ resources
            router_distributed: {get_input: neutron_router_distributed}
            mechanism_drivers: {get_input: neutron_mechanism_drivers}
            allow_automatic_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
+           l3_ha: {get_input: neutron_l3_ha}
            ovs:
              enable_tunneling: {get_input: neutron_enable_tunneling}
              local_ip: {get_input: controller_host}
@@@ -128,7 -129,7 +129,7 @@@
            rabbit_port: {get_input: rabbit_client_port}
          ntp:
            servers:
 -              - {server: {get_input: ntp_server}, fudge: "stratum 0"}
 +              - {server: {get_input: ntp_server}}
          virtual_interfaces:
            instances:
              - vrrp_instance_name: VI_CONTROL

diff --combined controller.yaml
index 3d767c5,059acba..9b7e3e0
--- 1/controller.yaml
--- 2/controller.yaml
+++ b/controller.yaml
@@@ -220,6 -220,10 +220,10 @@@ parameters
      default: 'True'
      description: Allow automatic l3-agent failover
      type: string
+   NeutronL3HA:
+     default: 'False'
+     description: Whether to enable l3-agent HA
+     type: string
    NeutronEnableTunnelling:
      type: string
      default: "True"
@@@ -344,14 -348,6 +348,14 @@@
        in the ring.
      hidden: true
      type: string
 +  SwiftMountCheck:
 +    default: 'false'
 +    description: Value of mount_check in Swift account/container/object -server.conf
 +    type: boolean
 +  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
@@@ -627,8 -623,6 +631,8 @@@ resources
          swift:
            hash: { get_input: swift_hash_suffix }
            part-power: { get_input: swift_part_power }
 +          mount-check: { get_input: swift_mount_check }
 +          min-part-hours: { get_input: swift_min_part_hours }
            replicas: {get_input: swift_replicas }
            service-password: { get_input: swift_password }
  
@@@ -640,9 -634,7 +644,9 @@@
        signal_transport: NO_SIGNAL
        input_values:
          swift_hash_suffix: {get_param: SwiftHashSuffix}
 +        swift_mount_check: {get_param: SwiftMountCheck}
          swift_password: {get_param: SwiftPassword}
 +        swift_min_part_hours: {get_param: SwiftMinPartHours}
          swift_part_power: {get_param: SwiftPartPower}
          swift_replicas: { get_param: SwiftReplicas}
  

diff --combined nova-compute-config.yaml
index 07aacd5,048881c..1fe787e
--- 1/nova-compute-config.yaml
--- 2/nova-compute-config.yaml
+++ b/nova-compute-config.yaml
@@@ -37,6 -37,7 +37,7 @@@ resources
            metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
            mechanism_drivers: {get_input: neutron_mechanism_drivers}
            allow_automatic_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
+           l3_ha: {get_input: neutron_l3_ha}
            ovs:
              local_ip: {get_input: neutron_local_ip}
              tenant_network_type: {get_input: neutron_tenant_network_type}
@@@ -55,7 -56,7 +56,7 @@@
            password: {get_input: rabbit_password}
          ntp:
            servers:
 -              - {server: {get_input: ntp_server}, fudge: "stratum 0"}
 +              - {server: {get_input: ntp_server}}
    NovaComputePassthrough:
      type: OS::Heat::StructuredConfig
      properties:

diff --combined overcloud-source.yaml
index f24a92b,5728c95..f73206d
--- 1/overcloud-source.yaml
--- 2/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@@ -295,6 -295,10 +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
@@@ -448,6 -452,8 +452,8 @@@ resources
              get_param: NeutronMechanismDrivers
          NeutronAllowL3AgentFailover:
              get_param: NeutronAllowL3AgentFailover
+         NeutronL3HA:
+             get_param: NeutronL3HA
    NovaCompute0AllNodesDeployment:
      type: FileInclude
      Path: nova-compute-instance.yaml
@@@ -614,6 -620,7 +620,7 @@@
            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:
@@@ -688,7 -695,7 +695,7 @@@
            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

diff --combined overcloud-without-mergepy.yaml
index 9ff0dc1,182fcab..79d5d9f
--- 1/overcloud-without-mergepy.yaml
--- 2/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@@ -139,6 -139,10 +139,10 @@@ parameters
      default: 'True'
      description: Allow automatic l3-agent failover
      type: string
+   NeutronL3HA:
+     default: 'False'
+     description: Whether to enable l3-agent HA
+     type: string
    NovaPassword:
      default: unset
      description: The password for the nova service account, used by nova-api.
@@@ -370,14 -374,6 +374,14 @@@
      description: The password for the swift service account, used by the swift proxy services.
      type: string
      hidden: true
 +  SwiftMountCheck:
 +    default: 'false'
 +    description: Value of mount_check in Swift account/container/object -server.conf
 +    type: boolean
 +  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
@@@ -441,7 -437,7 +445,7 @@@
  # Block storage specific parameters
    BlockStorageCount:
      type: number
 -    default: 1
 +    default: 0
    BlockStorageImage:
      default: overcloud-cinder-volume
      type: string
@@@ -517,6 -513,7 +521,7 @@@ resources
            NeutronAgentMode: {get_param: NeutronAgentMode}
            NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers}
            NeutronAllowL3AgentFailover: {get_param: NeutronAllowL3AgentFailover}
+           NeutronL3HA: {get_param: NeutronL3HA}
            NeutronNetworkType: {get_param: NeutronNetworkType}
            NeutronTunnelTypes: {get_param: NeutronTunnelTypes}
            NovaPassword: {get_param: NovaPassword}
@@@ -533,8 -530,6 +538,8 @@@
            SSLKey: {get_param: SSLKey}
            SSLCACertificate: {get_param: SSLCACertificate}
            SwiftHashSuffix: {get_param: SwiftHashSuffix}
 +          SwiftMountCheck: {get_param: SwiftMountCheck}
 +          SwiftMinPartHours: {get_param: SwiftMinPartHours}
            SwiftPartPower: {get_param: SwiftPartPower}
            SwiftPassword: {get_param: SwiftPassword}
            SwiftReplicas: { get_param: SwiftReplicas}
@@@ -577,6 -572,7 +582,7 @@@
            NeutronPublicInterfaceRawDevice: {get_param: NeutronPublicInterfaceRawDevice}
            NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers}
            NeutronAllowL3AgentFailover: {get_param: NeutronAllowL3AgentFailover}
+           NeutronL3HA: {get_param: NeutronL3HA}
            NovaApiHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
            NovaComputeDriver: {get_param: NovaComputeDriver}
            NovaComputeExtraConfig: {get_param: NovaComputeExtraConfig}
@@@ -621,8 -617,6 +627,8 @@@
            NeutronNetworkType: {get_param: NeutronNetworkType}
            Flavor: {get_param: OvercloudSwiftStorageFlavor}
            HashSuffix: {get_param: SwiftHashSuffix}
 +          MountCheck: {get_param: SwiftMountCheck}
 +          MinPartHours: {get_param: SwiftMinPartHours}
            PartPower: {get_param: SwiftPartPower}
            Password: {get_param: SwiftPassword}
            Image: {get_param: SwiftStorageImage}