diff --git a/.gitignore b/.gitignore index 69fe02e9e..fc4b12be2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ xs-config.spec build deprecated -.patches +.ansible +*.patches +*.log +*.retry diff --git a/roles/1-prep/tasks/prep.yml b/roles/1-prep/tasks/prep.yml index 989b5bc3c..43fdcbcb0 100644 --- a/roles/1-prep/tasks/prep.yml +++ b/roles/1-prep/tasks/prep.yml @@ -32,25 +32,6 @@ mode=0755 state=directory -# this script can be sourced to get iiab location -- name: Create iiab.env file - template: src=iiab.env.j2 - dest=/etc/iiab/iiab.env - owner=root - group=root - mode=0644 - -- name: put a python interface to iiab.env - template: src=iiab_env.py.j2 - dest=/etc/iiab/iiab_env.py - -- name: create ansible.d facts directory - file: path=/etc/ansible/facts.d - owner=root - group=root - mode=0750 - state=directory - - name: Set XO model set_fact: phplib_dir: '{{ ansible_local["local_facts"]["phplib_dir"] }}' diff --git a/roles/2-common/tasks/centos.yml b/roles/2-common/tasks/centos.yml index 31e992924..5db9cbc68 100644 --- a/roles/2-common/tasks/centos.yml +++ b/roles/2-common/tasks/centos.yml @@ -18,6 +18,7 @@ with_items: - iiab-centos.repo - li.nux.ro.repo + - ansible.repo #- name: Disable updating ansible on CentOS # shell: sed -i -e '/^enabled=/a exclude=ansible' {{ item }} diff --git a/roles/2-common/templates/ansible.repo b/roles/2-common/templates/ansible.repo new file mode 100644 index 000000000..ea7a0120d --- /dev/null +++ b/roles/2-common/templates/ansible.repo @@ -0,0 +1,7 @@ +[ansible] +name=ansible +failovermethod=priority +baseurl=http://releases.ansible.com/ansible/rpm/release/epel-7-x86_64/ +enabled=0 +metadata_expire=1d +gpgcheck=0 diff --git a/roles/3-base-server/tasks/main.yml b/roles/3-base-server/tasks/main.yml index 1da08a920..8eda7ca48 100644 --- a/roles/3-base-server/tasks/main.yml +++ b/roles/3-base-server/tasks/main.yml @@ -11,8 +11,8 @@ when: not installing # If we got here we're done -- name: Record base gui version - lineinfile: dest=/etc/iiab/iiab.env - regexp='^BASE_VERSION=*' - line='BASE_VERSION="{{ gui_version }}"' - state=present +#- name: Record base gui version +# lineinfile: dest=/etc/iiab/iiab.env +# regexp='^BASE_VERSION=*' +# line='BASE_VERSION="{{ gui_version }}"' +# state=present diff --git a/roles/4-server-options/tasks/main.yml b/roles/4-server-options/tasks/main.yml index 17c420b41..5dcbb13c5 100644 --- a/roles/4-server-options/tasks/main.yml +++ b/roles/4-server-options/tasks/main.yml @@ -1,6 +1,22 @@ - name: Server Options Installed command: echo Server Options Installed +# this script can be sourced to get iiab location +- name: Create iiab.env file + template: src=roles/1-prep/templates/iiab.env.j2 + dest=/etc/iiab/iiab.env + owner=root + group=root + mode=0644 + +- name: put a python interface to iiab.env + template: src=roles/1-prep/templates/iiab_env.py.j2 + dest=/etc/iiab/iiab_env.py + +- name: generate the offline documents + command: /usr/bin/iiab-refresh-wiki-docs + when: not nodocs + - name: Stop postgresql service command: "/etc/init.d/postgresql stop" ignore_errors: True @@ -22,5 +38,3 @@ service: name=xs-authserver state=restarted when: authserver_enabled - - diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index 9cd6e108c..3d7e271c6 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -153,10 +153,6 @@ dest=/usr/bin/iiab-refresh-wiki-docs mode=0755 -- name: generate the offline documents - command: /usr/bin/iiab-refresh-wiki-docs - when: not nodocs - - name: Give apache_user permission for poweroff template: src=020_apache_poweroff.j2 dest=/etc/sudoers.d/020_apache_poweroff diff --git a/roles/kalite/tasks/install.yml b/roles/kalite/tasks/install.yml index af064b584..40169dc8b 100644 --- a/roles/kalite/tasks/install.yml +++ b/roles/kalite/tasks/install.yml @@ -15,8 +15,9 @@ virtualenv={{ kalite_venv }} virtualenv_site_packages=no extra_args="--no-cache-dir" +# extra_args="--no-cache-dir" # extra_args="--disable-pip-version-check" - when: internet_available + when: internet_available and is_debuntu - name: Install ka-lite with pip pip: name=ka-lite-static @@ -24,8 +25,26 @@ virtualenv={{ kalite_venv }} virtualenv_site_packages=no extra_args="--no-cache-dir" +# extra_args="--no-cache-dir" # extra_args="--disable-pip-version-check" - when: internet_available + when: internet_available and is_debuntu + +- name: Install ka-lite dependencies with pip + pip: requirements={{ pip_packages_dir }}/kalite.txt + virtualenv={{ kalite_venv }} + virtualenv_site_packages=no +# extra_args="--no-cache-dir" +# extra_args="--disable-pip-version-check" + when: internet_available and not is_debuntu + +- name: Install ka-lite with pip + pip: name=ka-lite-static + version={{ kalite_version }} + virtualenv={{ kalite_venv }} + virtualenv_site_packages=no +# extra_args="--no-cache-dir" +# extra_args="--disable-pip-version-check" + when: internet_available and not is_debuntu - name: Default is to have cronserve started with kalite set_fact: diff --git a/roles/osm/tasks/main.yml b/roles/osm/tasks/main.yml index fa254d3d9..33039e02f 100644 --- a/roles/osm/tasks/main.yml +++ b/roles/osm/tasks/main.yml @@ -27,19 +27,39 @@ virtualenv={{ osm_venv }} virtualenv_site_packages=no version=2.6 - extra_args="--disable-pip-version-check --no-cache-dir" - when: internet_available + extra_args="--no-cache-dir" + when: internet_available and is_debuntu - name: Install IIAB with dependencies pip: name={{ item }} virtualenv={{ osm_venv }} virtualenv_site_packages=no - extra_args="--disable-pip-version-check --no-cache-dir" + extra_args="--no-cache-dir" with_items: - MarkupSafe - pytz - Internet-in-a-Box - when: internet_available + when: internet_available and is_debuntu + +# IIAB wants a specific version do that first +- name: Install Whoosh 2.6 + pip: name=whoosh + virtualenv={{ osm_venv }} + virtualenv_site_packages=no + version=2.6 +# extra_args="--no-cache-dir" + when: internet_available and not is_debuntu + +- name: Install IIAB with dependencies + pip: name={{ item }} + virtualenv={{ osm_venv }} + virtualenv_site_packages=no +# extra_args="--no-cache-dir" + with_items: + - MarkupSafe + - pytz + - Internet-in-a-Box + when: internet_available and not is_debuntu - name: Set osm_path set_fact: diff --git a/scripts/ansible b/scripts/ansible index bdced2c0f..19c56e6ad 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -42,8 +42,9 @@ fi if [ -f /etc/centos-release ]; then yum -y upgrade yum -y install ca-certificates nss epel-release - yum -y install ansible git bzip2 file findutils gzip hg svn sudo tar which unzip xz zip libselinux-python + yum -y install git bzip2 file findutils gzip hg svn sudo tar which unzip xz zip libselinux-python yum -y install python-pip python-setuptools python-wheel patch + yum -y install http://releases.ansible.com/ansible/rpm/release/epel-7-x86_64/ansible-2.4.0.0-1.el7.ans.noarch.rpm FOUND="yes" FAMILY="redhat" fi