fa22231bc7
When scaling ceph monitors, ceph-ansible uses context from the
fetch_directory to prevent new monitors from behaving like they
are the only monitors.
Save the fetch_directory in swift after each ceph-ansible playbook
run; and if there is a fetch directory in swift, restore it before
each playbook run.
Note that https://review.openstack.org/#/c/582811 only resolves
1769769 for Master where config-download external deploy tasks
run ceph-ansible. This change resolves 1769769 when using mistral
for Queens/Pike (when backported).
Change-Id: I4b576a6e7fbfb18fa13221e2d080bf7876a8303e
Depends-On: I995ad32345a39238ffb9cbcf9966dedc60c75ff8
Closes-Bug: #1769769
(cherry picked from commit 2f300dfd90)
56 lines
2.1 KiB
Python
56 lines
2.1 KiB
Python
# Copyright 2016 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.
|
|
import logging
|
|
import os
|
|
|
|
from oslo_concurrency import processutils
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
def create_tarball(directory, filename, options='-czf'):
|
|
"""Create a tarball of a directory."""
|
|
LOG.debug('Creating tarball of %s at location %s' % (directory, filename))
|
|
processutils.execute('/usr/bin/tar', '-C', directory, options, filename,
|
|
'--exclude', '.git', '--exclude', '.tox',
|
|
'--exclude', '*.pyc', '--exclude', '*.pyo', '.')
|
|
|
|
|
|
def tarball_extract_to_swift_container(object_client, filename, container):
|
|
LOG.debug('Uploading filename %s to Swift container %s' % (filename,
|
|
container))
|
|
with open(filename, 'r') as f:
|
|
object_client.put_object(
|
|
container=container,
|
|
obj='',
|
|
contents=f,
|
|
query_string='extract-archive=tar.gz',
|
|
headers={'X-Detect-Content-Type': 'true'}
|
|
)
|
|
|
|
|
|
def extract_tarball(directory, tarball, options='-xf', remove=False):
|
|
"""Extracts the tarball contained in the directory."""
|
|
full_path = directory + '/' + tarball
|
|
if not os.path.exists(full_path):
|
|
LOG.debug('Tarball %s does not exist' % full_path)
|
|
else:
|
|
LOG.debug('Extracting tarball %s' % full_path)
|
|
cmd = ['/usr/bin/tar', '-C', directory, options, full_path]
|
|
processutils.execute(*cmd)
|
|
if remove:
|
|
LOG.debug('Removing tarball %s' % full_path)
|
|
os.remove(full_path)
|