]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/log
ceph-ansible.git
8 years agoMerge pull request #1200 from ceph/contrib-branches
Sébastien Han [Thu, 19 Jan 2017 12:43:04 +0000 (13:43 +0100)]
Merge pull request #1200 from ceph/contrib-branches

contrib: push all new stable branches to the galaxy

8 years agocontrib: use prune to fetch 1200/head
Sébastien Han [Mon, 19 Dec 2016 09:05:44 +0000 (10:05 +0100)]
contrib: use prune to fetch

Sometimes git keeps data from remotes that are not up-to-date, i.e:
remote branches.
Using `--prune` will delete non-existing remote branches from git's caches.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agocontrib: push all new stable branches to the galaxy
Sébastien Han [Fri, 16 Dec 2016 22:27:33 +0000 (23:27 +0100)]
contrib: push all new stable branches to the galaxy

Prior to this patch we were only pushing 'master' and 'ansible-1.9'
branches. Each new release also introduces a new branch so we want to
push it as well.

Yes the 'grep' is a bit ugly, feel free to come up with something nicer :)

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1240 from ceph/galaxy-script-update
Sébastien Han [Thu, 19 Jan 2017 10:30:05 +0000 (11:30 +0100)]
Merge pull request #1240 from ceph/galaxy-script-update

ceph-docker-common: include a README and add to galaxy deployment script

8 years agoceph-docker-common: adds a README file 1240/head
Andrew Schoen [Wed, 18 Jan 2017 17:06:25 +0000 (11:06 -0600)]
ceph-docker-common: adds a README file

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoadds ceph-docker-common to the script that updates ansible galaxy
Andrew Schoen [Wed, 18 Jan 2017 17:00:51 +0000 (11:00 -0600)]
adds ceph-docker-common to the script that updates ansible galaxy

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1239 from ceph/ceph-docker-common-meta
Sébastien Han [Wed, 18 Jan 2017 16:48:45 +0000 (17:48 +0100)]
Merge pull request #1239 from ceph/ceph-docker-common-meta

ceph-docker-common: include a meta/main.yml so we can use galaxy

8 years agoceph-docker-common: include a meta/main.yml so we can use galaxy 1239/head
Andrew Schoen [Wed, 18 Jan 2017 16:46:48 +0000 (10:46 -0600)]
ceph-docker-common: include a meta/main.yml so we can use galaxy

This role needs a meta/main.yml before we can upload it to ansible
galaxy.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1229 from ceph/docker-fixes
Sébastien Han [Wed, 18 Jan 2017 13:54:12 +0000 (14:54 +0100)]
Merge pull request #1229 from ceph/docker-fixes

adds a ceph-docker-common role and enables custom registry usage

8 years agoMerge pull request #1230 from lae/kraken-run-ceph-create-keys
Sébastien Han [Tue, 17 Jan 2017 15:18:18 +0000 (16:18 +0100)]
Merge pull request #1230 from lae/kraken-run-ceph-create-keys

mon: run ceph-create-keys after startup for kraken release

8 years agomon: run ceph-create-keys after startup for kraken release 1230/head
Musee Ullah [Tue, 17 Jan 2017 12:13:43 +0000 (21:13 +0900)]
mon: run ceph-create-keys after startup for kraken release

8 years agoMerge pull request #1185 from ceph/ansible-test-version
Andrew Schoen [Mon, 16 Jan 2017 21:49:43 +0000 (15:49 -0600)]
Merge pull request #1185 from ceph/ansible-test-version

bump ansible testing version to 2.2.1 for the 2.2 environment

8 years agotests: remove the pip install ansible from stable github branch 1185/head
Alfredo Deza [Mon, 16 Jan 2017 21:19:25 +0000 (16:19 -0500)]
tests: remove the pip install ansible from stable github branch

Signed-off-by: Alfredo Deza <adeza@redhat.com>
8 years agotests: bump ansible testing version to 2.2.1 for the 2.2 environment
Alfredo Deza [Wed, 14 Dec 2016 15:57:40 +0000 (10:57 -0500)]
tests: bump ansible testing version to 2.2.1 for the 2.2 environment

Signed-off-by: Alfredo Deza <adeza@redhat.com>
8 years agoceph-osd: use ceph_docker_registry when preparing OSDs 1229/head
Andrew Schoen [Mon, 16 Jan 2017 17:39:13 +0000 (11:39 -0600)]
ceph-osd: use ceph_docker_registry when preparing OSDs

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoadd ceph_docker_registry to all.docker.yml.sample
Andrew Schoen [Mon, 16 Jan 2017 17:33:20 +0000 (11:33 -0600)]
add ceph_docker_registry to all.docker.yml.sample

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agouse ceph_docker_registry when starting containers
Andrew Schoen [Mon, 16 Jan 2017 17:17:41 +0000 (11:17 -0600)]
use ceph_docker_registry when starting containers

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoceph-docker-common: add symlink to ceph.ceph-docker-common
Andrew Schoen [Mon, 16 Jan 2017 16:17:36 +0000 (10:17 -0600)]
ceph-docker-common: add symlink to ceph.ceph-docker-common

This allows for the role to be used with ansible-galaxy and to fix the
include in all the meta/main.yml files in the roles.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agouse ceph_docker_registry in all the roles instead of docker.io
Andrew Schoen [Mon, 16 Jan 2017 15:52:20 +0000 (09:52 -0600)]
use ceph_docker_registry in all the roles instead of docker.io

This allows for ceph-ansible to use other docker registries.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoceph-common: include ceph_docker_registry when fetching the image
Andrew Schoen [Mon, 16 Jan 2017 15:51:20 +0000 (09:51 -0600)]
ceph-common: include ceph_docker_registry when fetching the image

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agouse ceph-docker-common in roles that support docker deployments
Andrew Schoen [Mon, 16 Jan 2017 15:30:53 +0000 (09:30 -0600)]
use ceph-docker-common in roles that support docker deployments

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoceph-docker-common: a new role to share things common to docker
Andrew Schoen [Mon, 16 Jan 2017 15:28:40 +0000 (09:28 -0600)]
ceph-docker-common: a new role to share things common to docker

We can use this to share common variables and tasks needed for every
containerized deployment.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1225 from D3N14L/osd_directories_default
Andrew Schoen [Fri, 13 Jan 2017 19:29:51 +0000 (13:29 -0600)]
Merge pull request #1225 from D3N14L/osd_directories_default

Set empty list as default for osd_directories

8 years agoAdded osd_directories to osd group_vars sample file 1225/head
Daniel Marks [Fri, 13 Jan 2017 18:36:10 +0000 (19:36 +0100)]
Added osd_directories to osd group_vars sample file

8 years agoSet empty list as default for osd_directories
Daniel Marks [Fri, 13 Jan 2017 14:27:16 +0000 (15:27 +0100)]
Set empty list as default for osd_directories

As described in issue #1224 leaving this variable undefined may
cause a problem during execution of the ceph-osd role.

8 years agoMerge pull request #1221 from ceph/purge-cluster-fixes
Alfredo Deza [Wed, 11 Jan 2017 13:59:58 +0000 (08:59 -0500)]
Merge pull request #1221 from ceph/purge-cluster-fixes

tests: fixes for purge_cluster_collocated

8 years agopurge-cluster: do not include ceph-osd and ceph-common defaults for osds 1221/head
Andrew Schoen [Tue, 10 Jan 2017 22:57:58 +0000 (16:57 -0600)]
purge-cluster: do not include ceph-osd and ceph-common defaults for osds

When purging OSDs we do not need to include these defaults as nothing in
the following tasks uses them. Also, it has the side effect of
overwriting any variables defined in group_vars files that are relative
to the inventory you are using with the default values. That behavior
was causing the CI tests to fail.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: copy purge-cluster.yml to root of ceph-ansible
Andrew Schoen [Tue, 10 Jan 2017 22:56:07 +0000 (16:56 -0600)]
tests: copy purge-cluster.yml to root of ceph-ansible

There is an Ansible bug which makes the playbook fail when we are
running a playbook from the non-git root directory. The real problem is
that the ansible.cfg is not honoured and we are including variable from
roles/<role>/defaults/main.yml

The fix is too copy the purge cluster playbook on the git root directory
and execute it.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1220 from ceph/latest-ansible2.2
Alfredo Deza [Tue, 10 Jan 2017 21:56:29 +0000 (16:56 -0500)]
Merge pull request #1220 from ceph/latest-ansible2.2

tests: test with the latest ansible stable-2.2 branch from github

8 years agotests: test with the latest ansible stable-2.2 branch from github 1220/head
Andrew Schoen [Tue, 10 Jan 2017 12:53:17 +0000 (06:53 -0600)]
tests: test with the latest ansible stable-2.2 branch from github

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1208 from clwells/multisite-defined-endpoint
Sébastien Han [Tue, 10 Jan 2017 21:12:04 +0000 (16:12 -0500)]
Merge pull request #1208 from clwells/multisite-defined-endpoint

[rtr] Granular Multi-site PULL Variables

8 years agore-regenerated group vars 1208/head
Chris Wells [Sat, 7 Jan 2017 14:33:56 +0000 (09:33 -0500)]
re-regenerated group vars

8 years agoUpdated pull[port|proto] to pull_[port|proto] and regenerated base group vars
Chris Wells [Sat, 7 Jan 2017 14:33:24 +0000 (09:33 -0500)]
Updated pull[port|proto] to pull_[port|proto] and regenerated base group vars

8 years agoMerge pull request #1217 from ceph/ceph-common-tag
Andrew Schoen [Thu, 5 Jan 2017 22:18:01 +0000 (16:18 -0600)]
Merge pull request #1217 from ceph/ceph-common-tag

ceph-common: always include release.yml

8 years agoceph-common: always include release.yml 1217/head
Ken Dreyer [Thu, 5 Jan 2017 21:29:53 +0000 (14:29 -0700)]
ceph-common: always include release.yml

Prior to this change, a playbook run with '--tags' or '--skip-tags'
would fail, because the ceph-common role would not include the
release.yml task, and this file defines critical things like
ceph_release.

Thanks Andrew Schoen <aschoen@redhat.com> for help with the fix.

8 years agoMerge pull request #1215 from ceph/purge-cluster-tests
Alfredo Deza [Tue, 3 Jan 2017 22:18:29 +0000 (17:18 -0500)]
Merge pull request #1215 from ceph/purge-cluster-tests

tests: adds a purge_cluster_collocated scenario

8 years agotests: adds a purge_cluster_collocated scenario 1215/head
Andrew Schoen [Thu, 22 Dec 2016 20:13:08 +0000 (14:13 -0600)]
tests: adds a purge_cluster_collocated scenario

This scenario brings up a 1 mon 1 osd cluster using journal collocation,
purges the cluster and then verifies it can redeploy the cluster.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agopurge-cluster: get journal partitions after zapping osd disks
Andrew Schoen [Thu, 22 Dec 2016 19:47:22 +0000 (13:47 -0600)]
purge-cluster: get journal partitions after zapping osd disks

In my testing zapping the osd disks deleted the journal
partitions, making the 'zap ceph journal partitions' task fail because
the partitions it found previously do not exist anymore.

This moves the task that finds the journal partitions after 'zap osd disks'
to catch any partitions ceph-disk might have missed.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agopurge-cluster: use ignore_errors: true when including group_vars files
Andrew Schoen [Thu, 22 Dec 2016 17:37:41 +0000 (11:37 -0600)]
purge-cluster: use ignore_errors: true when including group_vars files

Using failed_when will still throw an exception and stop the playbook if
the file you're trying to include doesn't exist.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1171 from cbodley/wip-libcephfs2
Sébastien Han [Tue, 3 Jan 2017 09:48:56 +0000 (10:48 +0100)]
Merge pull request #1171 from cbodley/wip-libcephfs2

bump package version to libcephfs2

8 years agoMerge pull request #1212 from ceph/cluster-name-info
Sébastien Han [Tue, 3 Jan 2017 09:18:41 +0000 (10:18 +0100)]
Merge pull request #1212 from ceph/cluster-name-info

common: document "cluster" variable usage

8 years agoMerge pull request #1213 from ceph/cephx-initial-mon
Sébastien Han [Mon, 2 Jan 2017 12:43:22 +0000 (13:43 +0100)]
Merge pull request #1213 from ceph/cephx-initial-mon

mon: only put mon initial key in mon kv when cephx is enabled

8 years agomon: only put mon initial key in mon kv when cephx is enabled 1213/head
Sébastien Han [Mon, 2 Jan 2017 10:16:03 +0000 (11:16 +0100)]
mon: only put mon initial key in mon kv when cephx is enabled

Task put initial mon keyring in mon kv store from
ceph-mon/tasks/ceph_keys.yml is failing when cephx is disabled. The root
cause is that variable monitor_keyring is not populated by any task from
deploy_monitors.yml.

Fixes: #1211
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1209 from zhsj/fix-check-firewall
Sébastien Han [Mon, 2 Jan 2017 09:44:20 +0000 (10:44 +0100)]
Merge pull request #1209 from zhsj/fix-check-firewall

fix check nmapexist on debian

8 years agocommon: document "cluster" variable usage 1212/head
Sébastien Han [Mon, 2 Jan 2017 08:20:43 +0000 (09:20 +0100)]
common: document "cluster" variable usage

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1408848
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agofix check nmapexist on debian 1209/head
Shengjing Zhu [Wed, 28 Dec 2016 08:21:23 +0000 (16:21 +0800)]
fix check nmapexist on debian

command is a shell-buitin, so `command -v nmap` must use shell module

Signed-off-by: Shengjing Zhu <zsj950618@gmail.com>
8 years agoAllowing granular control of the pull host/port/protocol for installs where SSL/443...
Chris Wells [Mon, 26 Dec 2016 02:54:13 +0000 (21:54 -0500)]
Allowing granular control of the pull host/port/protocol for installs where SSL/443 is used and direct civetweb access isn't necessarily available.

8 years agoMerge pull request #1203 from ceph/rhcs-mds-repo
Sébastien Han [Tue, 20 Dec 2016 12:51:59 +0000 (13:51 +0100)]
Merge pull request #1203 from ceph/rhcs-mds-repo

common: enable tool repo for mds install of rhcs

8 years agocommon: rename rh_storage to rhcs to match product name 1203/head
Sébastien Han [Tue, 20 Dec 2016 12:47:44 +0000 (13:47 +0100)]
common: rename rh_storage to rhcs to match product name

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agocommon: enable tool repo for mds install of rhcs
Sébastien Han [Tue, 20 Dec 2016 12:42:24 +0000 (13:42 +0100)]
common: enable tool repo for mds install of rhcs

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1405985
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1202 from tynorth-cisco/monitor
Sébastien Han [Mon, 19 Dec 2016 22:22:54 +0000 (23:22 +0100)]
Merge pull request #1202 from tynorth-cisco/monitor

use monitor name, not host ansible host in ceph.conf

8 years agouse monitor name, not host ansible host in ceph.conf 1202/head
tynorth-cisco [Mon, 19 Dec 2016 20:32:18 +0000 (12:32 -0800)]
use monitor name, not host ansible host in ceph.conf

in ceph-common there is a fact check for monitor name
that will set it to ansible_host or ansible_fqdn

8 years agoMerge pull request #1199 from Logan2211/fix-mon-fsid-block
Sébastien Han [Mon, 19 Dec 2016 10:30:58 +0000 (11:30 +0100)]
Merge pull request #1199 from Logan2211/fix-mon-fsid-block

Workaround for broken 'block' syntax

8 years agoMerge pull request #1153 from ceph/cluster-name-test v2.1.0
Andrew Schoen [Fri, 16 Dec 2016 19:10:52 +0000 (13:10 -0600)]
Merge pull request #1153 from ceph/cluster-name-test

test: add cluster name support test scenario

8 years agodocker: only use systemd to manage containers 1153/head
Sébastien Han [Fri, 16 Dec 2016 13:53:14 +0000 (14:53 +0100)]
docker: only use systemd to manage containers

Prior to this patch we had several ways to runs containers, we could use
ansible's docker module on some distro and on containers distros we were
using systemd. We strongly believe threating containers as services with
systemd is the right approach so this patch generalizes to all the
distros. These days most of the distros are running systemd so it's fair
assumption.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoWorkaround for broken 'block' syntax 1199/head
Logan V [Fri, 16 Dec 2016 15:24:48 +0000 (09:24 -0600)]
Workaround for broken 'block' syntax

The block syntax in ansible is broken on 2.1 so we work around the
issue introduced in 471be5e by using a task file include.

8 years agodocker: add support for cluster name
Sébastien Han [Wed, 14 Dec 2016 20:22:13 +0000 (21:22 +0100)]
docker: add support for cluster name

We need to honour the cluster name that was chosen by ceph-ansible and
pass it to ceph-docker.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1179 from Logan2211/rgw-keystone-v3
Sébastien Han [Fri, 16 Dec 2016 12:52:52 +0000 (13:52 +0100)]
Merge pull request #1179 from Logan2211/rgw-keystone-v3

RGW/Keystone integration improvements

8 years agoMerge pull request #1198 from ceph/mon-key-fix
Sébastien Han [Fri, 16 Dec 2016 12:38:23 +0000 (13:38 +0100)]
Merge pull request #1198 from ceph/mon-key-fix

Mon key fix

8 years agomon: add the initial mon keyring to the mon store 1198/head
Sébastien Han [Fri, 16 Dec 2016 10:42:17 +0000 (11:42 +0100)]
mon: add the initial mon keyring to the mon store

Once we have our first monitor up and running we need to add it to the
monitor store as a safety measure. Just in case the local file gets
deleted and you need to add a new monitor. Now you can retrieve this key
like this:

ceph config-key get initial_mon_keyring > initial_mon_keyring.txt

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agocommon: do not become root on local task
Sébastien Han [Fri, 16 Dec 2016 10:36:42 +0000 (11:36 +0100)]
common: do not become root on local task

There is no need to become root on local_action. This will event trigger
an error on some systems as it will try to run a sudo command. If the
current user does not have passwordless sudo, Ansible will fail. Anyway
using the current user is perfectly fine and no elevation privilege is
needed.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoAdd support for Keystone v3 API 1179/head
Logan V [Thu, 14 Jul 2016 19:27:03 +0000 (14:27 -0500)]
Add support for Keystone v3 API

The Keystone v2 APIs are deprecated and scheduled to be removed in
Q release of Openstack. This adds support for configuring RGW to
use the current Keystone v3 API.

8 years agoAdd a switch to disable nss PKI database initialization
Logan V [Thu, 14 Jul 2016 19:09:31 +0000 (14:09 -0500)]
Add a switch to disable nss PKI database initialization

The PKI keys are used to decrypt the Keystone revocation list when
PKI tokens are used. When UUID or Fernet token providers are used in
Keystone, PKI certs may not exist, so we now accommodate this scenario
by allowing the operator to disable the PKI tasks.

8 years agoAdd support for Keystone user authentication with RGW
Logan V [Mon, 11 Jul 2016 12:52:11 +0000 (07:52 -0500)]
Add support for Keystone user authentication with RGW

Jewel added support for user/pass authentication with Keystone,
allowing deployers to disable Keystone admin token as required
for production deployments.

This implements configuration for the new RGW Keystone user/pass
authentication feature added in Jewel.

See docs here: http://docs.ceph.com/docs/master/radosgw/keystone/

8 years agoMerge pull request #1178 from zhsj/dev-partition
Sébastien Han [Thu, 15 Dec 2016 21:50:23 +0000 (22:50 +0100)]
Merge pull request #1178 from zhsj/dev-partition

Add prepare osd with partition devices in raw_multi_journal

8 years agoMerge pull request #1194 from ceph/testing-output
Alfredo Deza [Thu, 15 Dec 2016 19:16:31 +0000 (14:16 -0500)]
Merge pull request #1194 from ceph/testing-output

tests: preserve newlines in ansible output when testing

8 years agotests: preserve newlines in ansible output when testing 1194/head
Andrew Schoen [Thu, 15 Dec 2016 18:23:17 +0000 (12:23 -0600)]
tests: preserve newlines in ansible output when testing

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1195 from ceph/rpm-require-ansible-2.2
Andrew Schoen [Thu, 15 Dec 2016 18:04:26 +0000 (12:04 -0600)]
Merge pull request #1195 from ceph/rpm-require-ansible-2.2

rpm: require Ansible >= 2.2.0.0

8 years agorpm: require Ansible >= 2.2.0.0 1195/head
Ken Dreyer [Thu, 15 Dec 2016 18:01:24 +0000 (11:01 -0700)]
rpm: require Ansible >= 2.2.0.0

This is the only version that our CI uses for testing, so it's the only
version we can confidently say works.

Update the RPM packaging to specifically require this version of
Ansible.

8 years agoMerge pull request #1192 from davidebelloni/master
Sébastien Han [Thu, 15 Dec 2016 16:38:38 +0000 (17:38 +0100)]
Merge pull request #1192 from davidebelloni/master

Adding Proxy support

8 years agoAdding Proxy support 1192/head
Davide Belloni [Thu, 15 Dec 2016 14:28:59 +0000 (15:28 +0100)]
Adding Proxy support

8 years agocommon: add the name of the ceph conf file in the play
Sébastien Han [Wed, 7 Dec 2016 17:22:39 +0000 (18:22 +0100)]
common: add the name of the ceph conf file in the play

Just for clarity and because we can we now show the name of the
ceph configuration file that is generated.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agotest: add cluster name support test scenario
Sébastien Han [Tue, 6 Dec 2016 10:20:23 +0000 (11:20 +0100)]
test: add cluster name support test scenario

We need to test the cluster name support in this CI as well. This
commit might be prone to debate because it tests 2 things in a single
scenario. We first test our ability to deploy a cluster AND the cluster
name support. However it's easier to do it this way and will reduce the
amount of time for testingg. If we don't do this we will have a
duplicate those 2 existing tests into new ones 'only' to test the
cluster name support.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1167 from guits/ceph-fsid
Sébastien Han [Thu, 15 Dec 2016 14:16:40 +0000 (15:16 +0100)]
Merge pull request #1167 from guits/ceph-fsid

common: do not regenerate initial mon keyring if cluster exists

8 years agoMerge pull request #1191 from ceph/docker-osd-check
Sébastien Han [Thu, 15 Dec 2016 14:16:15 +0000 (15:16 +0100)]
Merge pull request #1191 from ceph/docker-osd-check

osd: docker change required variables for check

8 years agoenable prepare osd with partition devices in raw_multi_journal 1178/head
Shengjing Zhu [Wed, 30 Nov 2016 10:00:39 +0000 (18:00 +0800)]
enable prepare osd with partition devices in raw_multi_journal

Address #895

Signed-off-by: Shengjing Zhu <zsj950618@gmail.com>
8 years agoinfrastructure playbook: add make osd partition
Shengjing Zhu [Wed, 14 Dec 2016 18:14:47 +0000 (02:14 +0800)]
infrastructure playbook: add make osd partition

Signed-off-by: Shengjing Zhu <zsj950618@gmail.com>
8 years agoosd: docker change required variables for check 1191/head
Sébastien Han [Thu, 15 Dec 2016 13:50:04 +0000 (14:50 +0100)]
osd: docker change required variables for check

when running a containerized deployment, some variable are not
applicable thus should not be checked.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agocommon: do not regenerate initial mon keyring if cluster exists 1167/head
Guillaume Abrioux [Thu, 8 Dec 2016 15:58:22 +0000 (16:58 +0100)]
common: do not regenerate initial mon keyring if cluster exists

This commit solves the situation where you lost your fetch directory and
you are running ansible against an existing cluster. Since no fetch
directory is present the file containing the initial mon keyring
doesn't exist so we are generating a new one.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #1190 from zhsj/fix-rest-api
Sébastien Han [Thu, 15 Dec 2016 12:43:33 +0000 (13:43 +0100)]
Merge pull request #1190 from zhsj/fix-rest-api

fix ceph-rest-api not using correct configure file

8 years agofix ceph-rest-api not using correct configure file 1190/head
Shengjing Zhu [Thu, 15 Dec 2016 12:17:00 +0000 (20:17 +0800)]
fix ceph-rest-api not using correct configure file

Signed-off-by: Shengjing Zhu <zsj950618@gmail.com>
8 years agoMerge pull request #1186 from ceph/apt-pining
Sébastien Han [Thu, 15 Dec 2016 11:28:45 +0000 (12:28 +0100)]
Merge pull request #1186 from ceph/apt-pining

common: set apt pinning with Red Hat Ceph Storage

8 years agoMerge pull request #1187 from ceph/wait-for
Sébastien Han [Wed, 14 Dec 2016 20:13:11 +0000 (21:13 +0100)]
Merge pull request #1187 from ceph/wait-for

common: show which file we are waiting for

8 years agocommon: show which file we are waiting for 1187/head
Sébastien Han [Wed, 14 Dec 2016 20:08:18 +0000 (21:08 +0100)]
common: show which file we are waiting for

We can now see the name of the file we are waiting for, depending on the
cluster name this will change.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agocommon: remove uncessary conditions and spell red hat entirely 1186/head
Sébastien Han [Wed, 14 Dec 2016 18:03:04 +0000 (19:03 +0100)]
common: remove uncessary conditions and spell red hat entirely

We do not need to run another condition for 'ceph_rhcs' since the
include we came from already has it, so we are already inside this
condition.
We also spell red hat entirely instead of rh and we remove capital
letters.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agocommon: set apt pinning with Red Hat Ceph Storage
Sébastien Han [Wed, 14 Dec 2016 17:15:02 +0000 (18:15 +0100)]
common: set apt pinning with Red Hat Ceph Storage

When `ceph_stable_rh_storage` is True, every cluster node should have a
`/etc/apt/preferences.d/rhcs.pref` file with the following contents:

```
Explanation: Prefer Red Hat packages
Package: *
Pin: release o=/Red Hat/
Pin-Priority: 999
```

ceph-deploy already did this when used with ice-setup, and we need to do
the same thing with the ceph-ansible stack.

Closes: #1182 and https://bugzilla.redhat.com/show_bug.cgi?id=1404515
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1180 from ceph/ceph-installer-sync
Sébastien Han [Wed, 14 Dec 2016 17:40:04 +0000 (18:40 +0100)]
Merge pull request #1180 from ceph/ceph-installer-sync

changes needed for ceph-installer support

8 years agoensure site.yml.sample always gathers facts and installs python2 1180/head
Andrew Schoen [Wed, 14 Dec 2016 15:13:55 +0000 (09:13 -0600)]
ensure site.yml.sample always gathers facts and installs python2

Then avoids an issue where if you're using tags to run the playbook then
no facts are gathered, resulting in subsequent tasks failing that depend
on them.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoadds the infrastructure-playbooks dir to the rpm packaging
Andrew Schoen [Mon, 12 Dec 2016 21:52:23 +0000 (15:52 -0600)]
adds the infrastructure-playbooks dir to the rpm packaging

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1184 from ceph/rhbz-1403576
Sébastien Han [Wed, 14 Dec 2016 13:51:43 +0000 (14:51 +0100)]
Merge pull request #1184 from ceph/rhbz-1403576

ceph-agent: do not check for subscription manager for agent install

8 years agoceph-agent: do not check for subscription manager for agent install 1184/head
Alfredo Deza [Wed, 14 Dec 2016 13:13:26 +0000 (08:13 -0500)]
ceph-agent: do not check for subscription manager for agent install

Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: rhbz#1403576

8 years agoMerge pull request #1183 from zhsj/fix-custom-repo
Sébastien Han [Wed, 14 Dec 2016 12:16:58 +0000 (13:16 +0100)]
Merge pull request #1183 from zhsj/fix-custom-repo

fix ceph_custom not usable

8 years agoMerge pull request #1181 from tynorth-cisco/key-issue
Sébastien Han [Wed, 14 Dec 2016 11:35:07 +0000 (12:35 +0100)]
Merge pull request #1181 from tynorth-cisco/key-issue

Change attribute call to .get call in ceph keys

8 years agoMerge pull request #1176 from jstuever/action_plugins
Sébastien Han [Wed, 14 Dec 2016 11:25:31 +0000 (12:25 +0100)]
Merge pull request #1176 from jstuever/action_plugins

Adding symlink to action_plugins so this works in ansible tower

8 years agofix ceph_custom not usable 1183/head
Shengjing Zhu [Wed, 14 Dec 2016 08:55:41 +0000 (16:55 +0800)]
fix ceph_custom not usable

Only when ceph_origin == "upstream", install_on_redhat.yml will include
redhat_ceph_repository.yml, same as debian.

In redhat_ceph_repository.yml, ceph_custom_repo will be added.

But in check_mandatory_vars.yml, ceph_origin=="upstream" can't be combined
with ceph_custom

8 years agoChange attribute call to .get call in ceph keys 1181/head
tynorth-cisco [Wed, 14 Dec 2016 00:48:14 +0000 (16:48 -0800)]
Change attribute call to .get call in ceph keys

If previous check was not run, .stdout_lines is not a valid key on the dictionary.
To get around this, use .get("stdout_lines") instead.

Also add in a default empty list

8 years agoMerge pull request #1158 from ceph/ceph-ansible-docker-vars
Andrew Schoen [Tue, 13 Dec 2016 21:55:51 +0000 (15:55 -0600)]
Merge pull request #1158 from ceph/ceph-ansible-docker-vars

docker: consolidate ceph-ansible and ceph-docker varible

8 years agoMerge pull request #1170 from font/docker_devices
Andrew Schoen [Tue, 13 Dec 2016 21:48:36 +0000 (15:48 -0600)]
Merge pull request #1170 from font/docker_devices

Add devices variable for Vagrantfile docker case

8 years agoMerge pull request #1174 from ceph/evelu-doc
Alfredo Deza [Mon, 12 Dec 2016 21:55:13 +0000 (16:55 -0500)]
Merge pull request #1174 from ceph/evelu-doc

README: Adding mailing list / irc / github entry points

8 years agoMerge pull request #1177 from ceph/makefile-version-detection
Andrew Schoen [Mon, 12 Dec 2016 21:45:35 +0000 (15:45 -0600)]
Merge pull request #1177 from ceph/makefile-version-detection

Makefile: strip "v" from RPM versions, and improve version detection