calamari-ctl: add flag to signal that we do not need root privs

Signed-off-by: Gregory Meno <gmeno@redhat.com>
Merge pull request #156 from ceph/wip-8448-1.2

cthulhu: add flag to signal that we do not need root privs

Reviewed-by: Dan Mick <dan.mick@inktank.com>
Clean up salt-bootstrap: 1) stable works for rhel7 2) use urllib everywhere

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Oops, nope, rhel7 not quite done yet

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Missed edit of path for bootstrap

Signed-off-by: Dan Mick <dan.mick@inktank.com>
cthulhu: absorb the salt from rest-api to get logs when the www user lacks privs to get them

Signed-off-by: Gregory Meno <gmeno@redhat.com>
Merge pull request #159 from ceph/wip-fix-logs

cthulhu: add log service function to avoid privilege probs calling salt directly from REST

Reviewed-by: Dan Mick <dan.mick@inktank.com>
vagrant/trusty-build: Added support for Ubuntu Trusty

Scripts for building on Ubuntu Trusty 64bit added.
Added the package python-support for trusty64.
Compiling on trusty64 ran out of memory with the default Vagrant configuration. Adjusted RAM from 512MB to 1024MB.

Signed-off-by: Jason Brown <jebrown@masterforge.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
trusty-build/Vagrantfile: Don't run highstate on vagrant up

Signed-off-by: Dan Mick <dan.mick@inktank.com>
debian/rules: if dh_python2 supports --no-rewrite-shebang, use it

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Makefile, conf/httpd: Collapse distro httpd confs into one:

- for all distros, use version >=2.4 for the new Require directive
- put WSGISocketPrefix in dynamically in Makefile

Signed-off-by: Dan Mick <dan.mick@inktank.com>
requirements.production.force.text: add mako

Mako is apparently on the trusty build machine but not production machines

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Merge pull request #163 from ceph/feature/trustybuild

Update for building on trusty
repobuild: make Ubuntu-version-specific (add trusty)

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Make each Vagrant VM use a different SSH port forward

Add auto_correct: true to allow collisions to be nonfatal

Signed-off-by: Dan Mick <dan.mick@inktank.com>
urllib-bootstrap-salt.sh: Add flexibility/diagnosability

Allow easy setting of URL, and keep a copy of the downloaded script
in case things go wrong
Merge pull request #164 from ceph/wip-trusty-repobuild

repobuild: make Ubuntu-version-specific (add trusty)

Reviewed-by: John Spray <john.spray@inktank.com>
Merge pull request #165 from ceph/wip-sshport

Make each Vagrant VM use a different SSH port forward (to avoid collisio...

Reviewed-by: John Spray <john.spray@inktank.com>
Merge pull request #166 from ceph/wip-salt-bootstrap

urllib-bootstrap-salt.sh: Add flexibility/diagnosability

Reviewed-by: John Spray <john.spray@inktank.com>
Merge branch origin/1.2 to master

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