image: install cauth with package

Change-Id: Ibaa3af2b7ba33572803de0b695f3803df10281a6
Depends-On: Ieef94601aeef7da61ccac65fa4ed5492e9bcddb7
Depends-On: I8357bc82efbdb9c449ba1a15a63552c457693ee5

Author: TristanCacqueray

config/ansible/roles/sf-base/tasks/setup.yml

@@ -147,4 +147,3 @@
   when: new_crt|changed
   with_items:
     - /usr/lib/python2.7/site-packages/requests/
-    - /var/www/cauth/lib/python2.7/site-packages/requests/

config/ansible/roles/sf-cauth/files/cauth.site

@@ -1,5 +1,5 @@
 WSGIScriptAlias /auth /var/www/cauth/app.wsgi
-WSGIDaemonProcess cauth python-path=/var/www/cauth/lib/python2.7/site-packages
+WSGIDaemonProcess cauth
 <Location /auth>
     WSGIPassAuthorization On
     WSGIProcessGroup cauth

config/ansible/roles/sf-cauth/tasks/install.yml

@@ -1,23 +1,7 @@
 ---
 - name: "Install requirements"
   yum:
-    name: "mod_auth_pubtkt"
+    name: "mod_auth_pubtkt, python2-cauth"
     state: present
     disablerepo: "{{ yum_disable_repo|default(omit) }}"
     enablerepo: "{{ yum_enable_repo|default(omit) }}"
-
-- name: "Install cauth venv"
-  command: chdir=/usr/src/cauth {{ item }}
-  with_items:
-    - virtualenv /var/www/cauth
-    - /var/www/cauth/bin/pip install --upgrade 'pbr' 'pip'
-    - sed -i 's/^.*pysflib.*//' requirements.txt
-    - sed -i 's/^paramiko.*/paramiko<2/' requirements.txt
-    - /var/www/cauth/bin/pip install -rrequirements.txt
-    - /var/www/cauth/bin/python setup.py install
-
-- name: "Install pysflib"
-  command: chdir=/usr/src/pysflib {{ item }}
-  with_items:
-    - /var/www/cauth/bin/pip install -rrequirements.txt
-    - /var/www/cauth/bin/python setup.py install

functestslib.sh

@@ -209,11 +209,9 @@ function build_image {
         sudo rsync -a --delete --no-owner config/config-repo/ ${IMAGE_PATH}/usr/local/share/sf-config-repo/
         sudo rsync -a --delete --no-owner serverspec/ ${IMAGE_PATH}/etc/serverspec/
         sudo rsync -a config/scripts/ ${IMAGE_PATH}/usr/local/bin/
-        sudo rsync -a --delete ${MANAGESF_CLONED_PATH}/managesf/ ${IMAGE_PATH}/var/www/managesf/lib/python2.7/site-packages/managesf/
-        sudo rsync -a --delete ${CAUTH_CLONED_PATH}/cauth/ ${IMAGE_PATH}/var/www/cauth/lib/python2.7/site-packages/cauth/
-        for sflibuser in /var/www/cauth /var/www/managesf /srv/sfmanager; do
-            sudo rsync -a --delete ${PYSFLIB_CLONED_PATH}/pysflib/ ${IMAGE_PATH}/${sflibuser}/lib/python2.7/site-packages/pysflib/
-        done
+        sudo rsync -a --delete ${MANAGESF_CLONED_PATH}/managesf/ ${IMAGE_PATH}/usr/lib/python2.7/site-packages/managesf/
+        sudo rsync -a --delete ${CAUTH_CLONED_PATH}/cauth/ ${IMAGE_PATH}/usr/lib/python2.7/site-packages/cauth/
+        sudo rsync -a --delete ${PYSFLIB_CLONED_PATH}/pysflib/ ${IMAGE_PATH}/usr/lib/python2.7/site-packages/pysflib/
         sudo cp image/edeploy/edeploy ${IMAGE_PATH}/usr/sbin/edeploy
         set +e
     fi

image/softwarefactory.install

@@ -341,6 +341,7 @@ remove_obsolete() {
     rm -Rf ${dir}/srv/sfmanager
     rm -Rf ${dir}/usr/local/murmur
     rm -Rf ${dir}/var/www/managesf
+    rm -Rf ${dir}/var/www/cauth
 
     # Gemfile is a sign /var/www/static was setup manually. It's now replaced by sf-web-assets package
     if [ -f ${dir}/var/www/static/font-awesome/Gemfile ]; then
@@ -354,10 +355,6 @@ fix_ansible_issue5504() {
 
 function install_sf {
     set -e
-    test -n "${CAUTH_CLONED_PATH}"
-    test -n "${MANAGESF_CLONED_PATH}"
-    test -n "${PYSFLIB_CLONED_PATH}"
-    test -n "${SFMANAGER_CLONED_PATH}"
 
     mkdir -p ${dir}/usr/src
 
@@ -370,14 +367,6 @@ function install_sf {
         retry do_chroot ${dir} pip install 'pip<8' ${STAGING_PIP}
     fi
 
-    # Make sure subproject are available
-    if [ ! -d "${CAUTH_CLONED_PATH}" ] || [ ! -d "${MANAGESF_CLONED_PATH}" ] || \
-        [ ! -d "${PYSFLIB_CLONED_PATH}" ] || [ ! -d "${SFMANAGER_CLONED_PATH}" ]; then
-        echo "Can't find subprojects in $(dirname ${CAUTH_CLONED_PATH})"
-        echo "Run ./image/fetch_subprojects.sh first"
-        exit -1
-    fi
-
     # Make sure final image use latest ids.tables
     cp ./C7.0-ids.tables ${dir}/etc/ids.tables
 
@@ -406,14 +395,6 @@ function install_sf {
     # be used as slave base image
     cp -Rv ./../tools/slaves/* ${dir}/usr/local/bin/
 
-    # Install cauth
-    rsync -a --delete ${CAUTH_CLONED_PATH}/ ${dir}/usr/src/cauth/
-    do_chroot ${dir} bash -c "cd /usr/src/cauth; /var/www/cauth/bin/python setup.py install"
-
-    # Install pysflib
-    rsync -a --delete ${PYSFLIB_CLONED_PATH}/ ${dir}/usr/src/pysflib/
-    do_chroot ${dir} bash -c "cd /usr/src/pysflib; /var/www/cauth/bin/python setup.py install"
-
     do_chroot ${dir} find /root /var/www /srv/ -name "*.pyc" -exec rm {} \;
 
     # Documentation
@@ -468,10 +449,6 @@ build_all() {
     checkpoint "edeploy, serverspect installed"
     remove_obsolete
     copy_sf_ansible_roles
-    # Copy prepared source to support depends-on
-    rsync -a --delete --exclude 'build' ${MANAGESF_CLONED_PATH}/ ${dir}/usr/src/managesf/
-    rsync -a --delete --exclude 'build' ${CAUTH_CLONED_PATH}/ ${dir}/usr/src/cauth/
-    rsync -a --delete --exclude 'build' ${PYSFLIB_CLONED_PATH}/ ${dir}/usr/src/pysflib/
     ansible_install sf-base
     ansible_install sf-gateway
     ansible_install sf-jenkins "$JENKINS_EXTRA_VARS"