diff options
| -rw-r--r-- | compute-config.yaml | 2 | ||||
| -rw-r--r-- | controller-config.yaml | 2 | ||||
| -rw-r--r-- | controller.yaml | 12 | ||||
| -rw-r--r-- | nova-compute-config.yaml | 2 | ||||
| -rw-r--r-- | overcloud-source.yaml | 2 | ||||
| -rw-r--r-- | overcloud-without-mergepy.yaml | 14 | ||||
| -rw-r--r-- | swift-storage.yaml | 7 | ||||
| -rw-r--r-- | undercloud-source.yaml | 2 |
8 files changed, 37 insertions, 6 deletions
diff --git a/compute-config.yaml b/compute-config.yaml index 872c9f7a..0a863aa9 100644 --- a/compute-config.yaml +++ b/compute-config.yaml @@ -69,7 +69,7 @@ resources: password: {get_input: rabbit_password} ntp: servers: - - {server: {get_input: ntp_server}, fudge: "stratum 0"} + - {server: {get_input: ntp_server}} outputs: config_id: diff --git a/controller-config.yaml b/controller-config.yaml index b58d20e3..30cc5c6c 100644 --- a/controller-config.yaml +++ b/controller-config.yaml @@ -129,7 +129,7 @@ resources: 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 --git a/controller.yaml b/controller.yaml index 059acba2..9b7e3e0c 100644 --- a/controller.yaml +++ b/controller.yaml @@ -348,6 +348,14 @@ parameters: 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 @@ -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 } @@ -634,7 +644,9 @@ resources: 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 --git a/nova-compute-config.yaml b/nova-compute-config.yaml index 048881c0..1fe787e3 100644 --- a/nova-compute-config.yaml +++ b/nova-compute-config.yaml @@ -56,7 +56,7 @@ resources: 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 --git a/overcloud-source.yaml b/overcloud-source.yaml index 5728c951..f73206d7 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -695,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 diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 182fcab5..79d5d9fa 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -374,6 +374,14 @@ parameters: 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 @@ -437,7 +445,7 @@ parameters: # Block storage specific parameters BlockStorageCount: type: number - default: 1 + default: 0 BlockStorageImage: default: overcloud-cinder-volume type: string @@ -530,6 +538,8 @@ resources: 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} @@ -617,6 +627,8 @@ resources: 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} diff --git a/swift-storage.yaml b/swift-storage.yaml index ea032b96..38359ffe 100644 --- a/swift-storage.yaml +++ b/swift-storage.yaml @@ -70,6 +70,10 @@ parameters: NeutronNetworkType: default: gre type: string + MinPartHours: + type: number + default: 1 + description: The minimum time (in hours) before a partition in a ring can be moved following a rebalance. PartPower: default: 10 description: Partition Power to use when building Swift rings @@ -107,6 +111,8 @@ resources: swift: hash: { get_input: swift_hash_suffix } part-power: { get_input: swift_part_power } + min-part-hours: { get_input: swift_min_part_hours } + mount-check: { get_input: swift_mount_check } replicas: {get_input: swift_replicas } service-password: { get_input: swift_password } neutron: @@ -150,6 +156,7 @@ resources: swift_hash_suffix: {get_param: HashSuffix} swift_mount_check: {get_param: MountCheck} swift_password: {get_param: Password} + swift_min_part_hours: {get_param: MinPartHours} swift_part_power: {get_param: PartPower} swift_replicas: { get_param: Replicas} diff --git a/undercloud-source.yaml b/undercloud-source.yaml index 0b126146..ce5b7e8d 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -346,7 +346,7 @@ resources: - value ntp: servers: - - {server: {get_param: NtpServer}, fudge: "stratum 0"} + - {server: {get_param: NtpServer}} undercloudPassthroughConfig: type: OS::Heat::StructuredConfig properties: |