Syntax error in previous commit

Signed-off-by: Dan Mick <dan.mick@inktank.com>
salt: load ceph modules at function scope

This is what already happened until the timeout
stuff in 58242677e.  Imports were moved up to
module scope for defining exception classes, result
was that whole module needed reloading on transition
from ceph not installed to ceph installed.

Revert to importing at function scope, and make our
exceptions not inherit from rados.Error so that they
don't care.

Fixes: #8566

Signed-off-by: John Spray <john.spray@redhat.com>
Merge pull request #138 from ceph/wip-8566-jcs

Wip 8566 jcs
tests: Fix to not alter the default pools

Signed-off-by: Gregory Meno <gregory.meno@inktank.com>
(cherry picked from commit 8bf6eebdc95d1fa89e3edab84b5f6953bae3f082)
calamari_web: improve static file serving

* Remove the login_required on serving static files, the UI
  handles the case where it's loaded without authentication.
* Less repetition in setting up the URLs, just have a list of paths
  to serve (but still with the special case for dashboard :-/)
* Give a helpful message when UI files are not found, to reduce
  the "why is it saying /login/ not found?" queries.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 6faec13a9022f926257ab09d9a096faf9465158d)
Vagrantfiles: don't run highstate when bringing up

Signed-off-by: Dan Mick <dan.mick@inktank.com>
RHEL repo certificates may be readonly-root; work around with sudo

This means the build will sudo, which could cause problems for automation
if the build user doesn't have passwordless sudo set up.  We do, at
the moment, but other users may want to beware.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Add build files for RHEL7.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Switch requirements based on ${pyver} rather than $(FLAVOR)

The one real difference, importlib, depends on the Python version,
but we have that handy already in the shell snippet; use it.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Workarounds for salt bug https://github.com/saltstack/salt/pull/12316

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Workarounds for salt bug https://github.com/saltstack/salt/pull/12316

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Add a specialization of httpd conf for RHEL7/Apache 2.4's new auth directives

Also, make get-flavor.sh a bit more careful, and call 'rh' 'el6' to reflect
the fact that it's been used for both Centos and RHEL 6.x.  (rhel7 is still
named rhel7 simply because Centos 7 hasn't been validated.)  Make FLAVOR
apply to calamari.conf as well, even though it's of little use there.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Merge branch 'wip-rhel7' into 1.2

Conflicts:
	salt/local/postgres.sls
Mismerge of postgres.sls left extra {% endif %}

Signed-off-by: Dan Mick <dan.mick@inktank.com>
curl now failing on centos 6.4; use 'urllib' workaround with stable bootstrap

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Put centos-bootstrap-salt.sh in correct directory

Signed-off-by: Dan Mick <dan.mick@inktank.com>
tests: change get_timeout_scaling_factor to return int

Signed-off-by: Gregory Meno <gregory.meno@inktank.com>
tests: Move api location and creds into test config template

Signed-off-by: Gregory Meno <gregory.meno@inktank.com>
tests: Reduce operations on pools during inter-test reset

Signed-off-by: Gregory Meno <gregory.meno@inktank.com>
tests: remove port number

Signed-off-by: Gregory Meno <gregory.meno@inktank.com>