diff options
| author |   Dan Prince <dprince@redhat.com> | 2015-01-22 15:03:03 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2015-02-04 09:33:13 -0500 |
| commit | dd80103568c275ca8405c5a146a3bb010e1a7fc7 (patch) | |
| tree | edc59645939b33a806a851106ca49c600a8ab5e1 /puppet | |
| parent | a536d3c8887b99c3b6e270c2e6c2469e4241eb7a (diff) | |
Puppet: Ntp support
This patch adds NTP support to all roles.
As part of this change overcloud-without-mergepy.yaml has
also been updated so that it passes the NtpServer parameters into
the Swift and Cinder storage node templates so that Ntp can
also be configured on those machines as well.
NOTE: The puppet support here uses the puppetlabs-ntp modules
which we add in Ib10ccbfdb3140b19f40049707548c6655d250e1c.
Change-Id: If2ef236fa42a714e84c6944eee5fe4daddf3fedf
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/overcloud_compute.pp | 2 | ||||
| -rw-r--r-- | puppet/overcloud_controller.pp | 2 | ||||
| -rw-r--r-- | puppet/overcloud_object.pp | 2 | ||||
| -rw-r--r-- | puppet/overcloud_volume.pp | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/puppet/overcloud_compute.pp b/puppet/overcloud_compute.pp index 798fb544..d187e031 100644 --- a/puppet/overcloud_compute.pp +++ b/puppet/overcloud_compute.pp @@ -13,6 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. +include ::ntp + class { 'nova': glance_api_servers => join([hiera('glance_protocol'), '://', hiera('glance_host'), ':', hiera('glance_port')]), } diff --git a/puppet/overcloud_controller.pp b/puppet/overcloud_controller.pp index 90f69eb1..6535afe1 100644 --- a/puppet/overcloud_controller.pp +++ b/puppet/overcloud_controller.pp @@ -15,6 +15,8 @@ if hiera('step') >= 1 { + include ::ntp + # TODO Galara class { 'mysql::server': override_options => { diff --git a/puppet/overcloud_object.pp b/puppet/overcloud_object.pp index ffd80886..92b2a66f 100644 --- a/puppet/overcloud_object.pp +++ b/puppet/overcloud_object.pp @@ -13,6 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. +include ::ntp + include ::swift class {'swift::storage::all': mount_check => str2bool(hiera('swift_mount_check')) diff --git a/puppet/overcloud_volume.pp b/puppet/overcloud_volume.pp index 460a82b4..e21eca50 100644 --- a/puppet/overcloud_volume.pp +++ b/puppet/overcloud_volume.pp @@ -13,6 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. +include ::ntp + include ::cinder include ::cinder::volume include ::cinder::volume::iscsi |