From e0a13501c02ea645d5ae98b26c67ccf45245f6e2 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Mon, 16 Oct 2017 21:17:23 -0500 Subject: [PATCH 1/8] bump centos to ansible 2.4.0 --- scripts/ansible | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From 7b12175e50980b88e6ea6597b1983efdc4d8af57 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Tue, 17 Oct 2017 00:19:27 -0500 Subject: [PATCH 2/8] OSM - centos remove --disable-pip-version-check --- roles/osm/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/osm/tasks/main.yml b/roles/osm/tasks/main.yml index fa254d3d9..db2163081 100644 --- a/roles/osm/tasks/main.yml +++ b/roles/osm/tasks/main.yml @@ -34,7 +34,7 @@ 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 From 574b292f20ebb758bb330c38c63ec796bc12deb2 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Tue, 17 Oct 2017 01:50:27 -0500 Subject: [PATCH 3/8] OSM - centos remove --disable-pip-version-check - 2 --- roles/osm/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/osm/tasks/main.yml b/roles/osm/tasks/main.yml index db2163081..4fdaeaef3 100644 --- a/roles/osm/tasks/main.yml +++ b/roles/osm/tasks/main.yml @@ -27,7 +27,7 @@ virtualenv={{ osm_venv }} virtualenv_site_packages=no version=2.6 - extra_args="--disable-pip-version-check --no-cache-dir" + extra_args="--no-cache-dir" when: internet_available - name: Install IIAB with dependencies From a4c69e8597e1f9a2860fbb9e9e58c9000b86be69 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Tue, 17 Oct 2017 02:25:30 -0500 Subject: [PATCH 4/8] centos remove --no-cache-dir --- roles/kalite/tasks/install.yml | 4 ++-- roles/osm/tasks/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/kalite/tasks/install.yml b/roles/kalite/tasks/install.yml index af064b584..3ba909bab 100644 --- a/roles/kalite/tasks/install.yml +++ b/roles/kalite/tasks/install.yml @@ -14,7 +14,7 @@ pip: requirements={{ pip_packages_dir }}/kalite.txt 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 @@ -23,7 +23,7 @@ version={{ kalite_version }} 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 diff --git a/roles/osm/tasks/main.yml b/roles/osm/tasks/main.yml index 4fdaeaef3..a26b53de9 100644 --- a/roles/osm/tasks/main.yml +++ b/roles/osm/tasks/main.yml @@ -27,14 +27,14 @@ virtualenv={{ osm_venv }} virtualenv_site_packages=no version=2.6 - extra_args="--no-cache-dir" +# extra_args="--no-cache-dir" when: internet_available - name: Install IIAB with dependencies pip: name={{ item }} virtualenv={{ osm_venv }} virtualenv_site_packages=no - extra_args="--no-cache-dir" +# extra_args="--no-cache-dir" with_items: - MarkupSafe - pytz From a351511b0d6bd2b58ce0167463ba8a99a33f8ef2 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 18 Oct 2017 01:26:45 -0500 Subject: [PATCH 5/8] supply ansible.repo for updating --- roles/2-common/tasks/centos.yml | 1 + roles/2-common/templates/ansible.repo | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 roles/2-common/templates/ansible.repo 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..a6918bdb7 --- /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=1 +metadata_expire=1d +gpgcheck=0 From 0064694bbebc6c2d64fd8b07b22c0f1d59a26981 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 18 Oct 2017 17:20:17 -0500 Subject: [PATCH 6/8] limit --no-cache-dir exclude to is_redhat --- roles/kalite/tasks/install.yml | 6 ++++++ roles/osm/tasks/main.yml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/roles/kalite/tasks/install.yml b/roles/kalite/tasks/install.yml index 3ba909bab..4077b7c8a 100644 --- a/roles/kalite/tasks/install.yml +++ b/roles/kalite/tasks/install.yml @@ -14,6 +14,9 @@ pip: requirements={{ pip_packages_dir }}/kalite.txt virtualenv={{ kalite_venv }} virtualenv_site_packages=no + {% if not is_redhat %} + extra_args="--no-cache-dir" + {% endif %} # extra_args="--no-cache-dir" # extra_args="--disable-pip-version-check" when: internet_available @@ -23,6 +26,9 @@ version={{ kalite_version }} virtualenv={{ kalite_venv }} virtualenv_site_packages=no + {% if not is_redhat %} + extra_args="--no-cache-dir" + {% endif %} # extra_args="--no-cache-dir" # extra_args="--disable-pip-version-check" when: internet_available diff --git a/roles/osm/tasks/main.yml b/roles/osm/tasks/main.yml index a26b53de9..a815c0e91 100644 --- a/roles/osm/tasks/main.yml +++ b/roles/osm/tasks/main.yml @@ -27,6 +27,9 @@ virtualenv={{ osm_venv }} virtualenv_site_packages=no version=2.6 + {% if not is_redhat %} + extra_args="--no-cache-dir" + {% endif %} # extra_args="--no-cache-dir" when: internet_available @@ -34,6 +37,9 @@ pip: name={{ item }} virtualenv={{ osm_venv }} virtualenv_site_packages=no + {% if not is_redhat %} + extra_args="--no-cache-dir" + {% endif %} # extra_args="--no-cache-dir" with_items: - MarkupSafe From 6d87652e8c8d4b2ccca77a51d20807f8297d2242 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 18 Oct 2017 19:54:28 -0500 Subject: [PATCH 7/8] just dup the code --- roles/kalite/tasks/install.yml | 25 +++++++++++++++++++------ roles/osm/tasks/main.yml | 28 +++++++++++++++++++++------- 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/roles/kalite/tasks/install.yml b/roles/kalite/tasks/install.yml index 4077b7c8a..40169dc8b 100644 --- a/roles/kalite/tasks/install.yml +++ b/roles/kalite/tasks/install.yml @@ -14,24 +14,37 @@ pip: requirements={{ pip_packages_dir }}/kalite.txt virtualenv={{ kalite_venv }} virtualenv_site_packages=no - {% if not is_redhat %} extra_args="--no-cache-dir" - {% endif %} # 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 version={{ kalite_version }} virtualenv={{ kalite_venv }} virtualenv_site_packages=no - {% if not is_redhat %} extra_args="--no-cache-dir" - {% endif %} # 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 a815c0e91..33039e02f 100644 --- a/roles/osm/tasks/main.yml +++ b/roles/osm/tasks/main.yml @@ -27,25 +27,39 @@ virtualenv={{ osm_venv }} virtualenv_site_packages=no version=2.6 - {% if not is_redhat %} extra_args="--no-cache-dir" - {% endif %} -# extra_args="--no-cache-dir" - when: internet_available + when: internet_available and is_debuntu - name: Install IIAB with dependencies pip: name={{ item }} virtualenv={{ osm_venv }} virtualenv_site_packages=no - {% if not is_redhat %} extra_args="--no-cache-dir" - {% endif %} + with_items: + - MarkupSafe + - pytz + - Internet-in-a-Box + 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 + when: internet_available and not is_debuntu - name: Set osm_path set_fact: From 07c4243b9188129ac98e57d0b2b91bf5a2c3819d Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 19 Oct 2017 11:36:25 -0500 Subject: [PATCH 8/8] disable ansible repo for now --- roles/2-common/templates/ansible.repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/2-common/templates/ansible.repo b/roles/2-common/templates/ansible.repo index a6918bdb7..ea7a0120d 100644 --- a/roles/2-common/templates/ansible.repo +++ b/roles/2-common/templates/ansible.repo @@ -2,6 +2,6 @@ name=ansible failovermethod=priority baseurl=http://releases.ansible.com/ansible/rpm/release/epel-7-x86_64/ -enabled=1 +enabled=0 metadata_expire=1d gpgcheck=0