e3cc44579c
Currently when deploying swift on the Controller nodes, we do the ringbuilder config during step3 and the swift-storage config during step 4, but this order is reversed on the ObjectStorage nodes. Also, we include the base swift class inconsistently during step2 on controller nodes, and via the overcloud-object manifest on ObjectStorage nodes. So fix this inconsistency as a precursor to conversion to composable services interfaces for the ObjectStorage role, we rework the post config so we apply the ObjectStorage config in steps 2, 3 and 4, which should hopefully get us much closer to the process used on the controller role, thus be easier to decompose in a compatible way. Partially-Implements: blueprint composable-services-within-roles Change-Id: Ic9d0ed8584a12d681a8f4d4742d39b96c15e531a
100 lines
2.7 KiB
Puppet
100 lines
2.7 KiB
Puppet
# Copyright 2015 Red Hat, Inc.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
define add_devices(
|
|
$swift_zones = '1'
|
|
){
|
|
|
|
# NOTE(dprince): Swift zones is not yet properly wired into the Heat
|
|
# templates. See: https://review.openstack.org/#/c/97758/3
|
|
# For now our regex supports the r1z1-192.0.2.6:%PORT%/d1 syntax or the
|
|
# newer r1z%<controller or SwiftStorage><N>%-192.0.2.6:%PORT%/d1 syntax.
|
|
$server_num_or_device = regsubst($name,'^r1z%+[A-Za-z]*([0-9]+)%+-(.*)$','\1')
|
|
if (is_integer($server_num_or_device)) {
|
|
$server_num = $server_num_or_device
|
|
} else {
|
|
$server_num = '1'
|
|
}
|
|
# Function to place server in its zone. Zone is calculated by
|
|
# server number in heat template modulo the number of zones + 1.
|
|
$zone = (($server_num%$swift_zones) + 1)
|
|
|
|
# add the rings
|
|
$base = regsubst($name,'^r1.*-(.*)$','\1')
|
|
$object = regsubst($base, '%PORT%', '6000')
|
|
ring_object_device { $object:
|
|
zone => '1',
|
|
weight => 100,
|
|
}
|
|
$container = regsubst($base, '%PORT%', '6001')
|
|
ring_container_device { $container:
|
|
zone => '1',
|
|
weight => 100,
|
|
}
|
|
$account = regsubst($base, '%PORT%', '6002')
|
|
ring_account_device { $account:
|
|
zone => '1',
|
|
weight => 100,
|
|
}
|
|
}
|
|
|
|
class tripleo::ringbuilder (
|
|
$swift_zones = '1',
|
|
$devices = '',
|
|
$build_ring = true,
|
|
$part_power,
|
|
$replicas,
|
|
$min_part_hours,
|
|
) {
|
|
|
|
validate_bool($build_ring)
|
|
|
|
if $build_ring {
|
|
|
|
$device_array = strip(split(rstrip($devices), ','))
|
|
|
|
# create local rings
|
|
swift::ringbuilder::create{ ['object', 'account', 'container']:
|
|
part_power => $part_power,
|
|
replicas => min(count($device_array), $replicas),
|
|
min_part_hours => $min_part_hours,
|
|
} ->
|
|
|
|
# add all other devices
|
|
add_devices {$device_array:
|
|
swift_zones => $swift_zones,
|
|
} ->
|
|
|
|
# rebalance
|
|
swift::ringbuilder::rebalance{ ['object', 'account', 'container']:
|
|
seed => 999,
|
|
}
|
|
|
|
Ring_object_device<| |> ~> Exec['rebalance_object']
|
|
Ring_object_device<| |> ~> Exec['rebalance_account']
|
|
Ring_object_device<| |> ~> Exec['rebalance_container']
|
|
|
|
}
|
|
}
|
|
|
|
if hiera('step') >= 2 {
|
|
# pre-install swift here so we can build rings
|
|
include ::swift
|
|
}
|
|
|
|
if hiera('step') >= 3 {
|
|
include ::tripleo::ringbuilder
|
|
}
|