diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-22 01:55:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-22 01:55:53 +0000 |
| commit | e86786211ad32fa8c17f5a40297d6133d7764da0 (patch) | |
| tree | 4c7ffb4b12904b8280b3e17a435801cff23fb7bb /puppet | |
| parent | 791b32d506267a2f12f54b6a2ebfd1478d97c25c (diff) | |
| parent | 94166fb66a7bb9e57a675adbbc47b3ec7e8f6466 (diff) | |
Merge "Composable roles within services - NTP - CephStorage"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/ceph-storage.yaml | 6 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_cephstorage.pp | 5 |
2 files changed, 1 insertions, 10 deletions
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml index eedb35e4..7a71ea80 100644 --- a/puppet/ceph-storage.yaml +++ b/puppet/ceph-storage.yaml @@ -21,10 +21,6 @@ parameters: default: default constraints: - custom_constraint: nova.keypair - 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 @@ -232,7 +228,6 @@ resources: config: {get_resource: CephStorageConfig} server: {get_resource: CephStorage} input_values: - ntp_servers: {get_param: NtpServer} timezone: {get_param: TimeZone} enable_package_install: {get_param: EnablePackageInstall} enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]} @@ -274,7 +269,6 @@ resources: ceph: raw_data: {get_file: hieradata/ceph.yaml} mapped_data: - 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} diff --git a/puppet/manifests/overcloud_cephstorage.pp b/puppet/manifests/overcloud_cephstorage.pp index 4add2f02..e69353b0 100644 --- a/puppet/manifests/overcloud_cephstorage.pp +++ b/puppet/manifests/overcloud_cephstorage.pp @@ -23,10 +23,7 @@ if hiera('step') >= 1 { Exec <| tag == 'kmod::load' |> -> Sysctl <| |> include ::timezone - - if count(hiera('ntp::servers')) > 0 { - include ::ntp - } + } if hiera('step') >= 3 { |