diff options
author | 2016-06-22 01:55:45 +0000 | |
---|---|---|
committer | 2016-06-22 01:55:45 +0000 | |
commit | 791b32d506267a2f12f54b6a2ebfd1478d97c25c (patch) | |
tree | cda630822ea77c1ae83c4fc2d7eaa9d5a39d2f72 | |
parent | 5210355461cbaded0c66fee258245699ec469cdc (diff) | |
parent | 1bab553fd591810b242963b394daad6019e78f2a (diff) |
Merge "Composable roles within services - NTP - ObjectStorage"
-rw-r--r-- | overcloud.yaml | 4 | ||||
-rw-r--r-- | puppet/manifests/overcloud_object.pp | 3 | ||||
-rw-r--r-- | puppet/swift-storage.yaml | 6 |
3 files changed, 2 insertions, 11 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index a1a1a312..61956b29 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -659,7 +659,8 @@ parameters: description: Optional scheduler hints to pass to nova default: {} ObjectStorageServices: - default: [] + default: + - OS::TripleO::Services::Ntp description: A list of service resources (configured in the Heat resource_registry) which represent nested stacks for each service that should get installed on the ObjectStorage nodes. @@ -1065,7 +1066,6 @@ resources: Image: {get_param: SwiftStorageImage} Replicas: { get_param: SwiftReplicas} TimeZone: {get_param: TimeZone} - NtpServer: {get_param: NtpServer} UpdateIdentifier: {get_param: UpdateIdentifier} ServiceNetMap: {get_param: ServiceNetMap} Hostname: diff --git a/puppet/manifests/overcloud_object.pp b/puppet/manifests/overcloud_object.pp index 3585c993..4fca8f5f 100644 --- a/puppet/manifests/overcloud_object.pp +++ b/puppet/manifests/overcloud_object.pp @@ -23,9 +23,6 @@ if hiera('step') >= 1 { include ::timezone - if count(hiera('ntp::servers')) > 0 { - include ::ntp - } } if hiera('step') >= 4 { diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml index ed52f928..30f7657b 100644 --- a/puppet/swift-storage.yaml +++ b/puppet/swift-storage.yaml @@ -46,10 +46,6 @@ parameters: description: The user password for SNMPd with readonly rights running on all Overcloud nodes type: string hidden: true - NtpServer: - default: '' - description: Comma-separated list of ntp servers - type: comma_delimited_list EnablePackageInstall: default: 'false' description: Set to true to enable package installation via Puppet @@ -292,7 +288,6 @@ resources: swift::storage::all::storage_local_net_ip: {get_input: swift_management_network} swift_mount_check: {get_input: swift_mount_check } tripleo::ringbuilder::min_part_hours: { get_input: swift_min_part_hours } - ntp::servers: {get_input: ntp_servers} timezone::timezone: {get_input: timezone} snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name} snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password} @@ -317,7 +312,6 @@ resources: swift_ring_build: {get_param: RingBuild} swift_part_power: {get_param: PartPower} swift_replicas: { get_param: Replicas} - ntp_servers: {get_param: NtpServer} timezone: {get_param: TimeZone} enable_package_install: {get_param: EnablePackageInstall} enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]} |