diff options
| author |   Carlos Camacho <ccamacho@redhat.com> | 2016-06-20 08:37:55 +0200 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2016-06-30 22:53:51 +0000 |
| commit | 68372785cdea95f702f7b983d4697924d51e3fd6 (patch) | |
| tree | 7849087a82771f8480e9593ef5b8ab1a23567afb /puppet/manifests | |
| parent | ddda39b3c7ef90d0175f8424bee51abe94a9b6fc (diff) | |
Composable Timezone service - Controller
Add timezone as a composable service
Change-Id: I99f0b0727a10ee74ea1de0499c8bc3ba37ab3345
Partially-implements: blueprint composable-services-within-roles
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 2 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index b79eca4a..d8166f20 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -28,8 +28,6 @@ if hiera('step') >= 1 { if hiera('step') >= 2 { - include ::timezone - # MongoDB if downcase(hiera('ceilometer_backend')) == 'mongodb' { # NOTE(gfidente): We need to pass the list of IPv6 addresses *with* port and diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index e095c966..9f636ddd 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -57,8 +57,6 @@ if hiera('step') >= 1 { create_resources(sysctl::value, hiera('sysctl_settings'), {}) Exec <| tag == 'kmod::load' |> -> Sysctl <| |> - include ::timezone - $pacemaker_cluster_members = downcase(regsubst(hiera('controller_node_names'), ',', ' ', 'G')) $corosync_ipv6 = str2bool(hiera('corosync_ipv6', false)) if $corosync_ipv6 { |