You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by cs...@apache.org on 2017/08/03 00:59:52 UTC
[incubator-openwhisk] branch master updated: Remove privilege
escalation. (#2536)
This is an automated email from the ASF dual-hosted git repository.
csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 97aba71 Remove privilege escalation. (#2536)
97aba71 is described below
commit 97aba7136fa81c3d5accbbb1a32a3a83304af1b3
Author: rodric rabbah <ro...@gmail.com>
AuthorDate: Wed Aug 2 20:59:50 2017 -0400
Remove privilege escalation. (#2536)
* Remove privilege escalation.
* python hackery.
---
ansible/registry.yml | 1 -
ansible/roles/cli/tasks/clean.yml | 1 -
ansible/roles/controller/tasks/clean.yml | 2 --
ansible/roles/controller/tasks/deploy.yml | 1 -
ansible/roles/docker/tasks/clean.yml | 1 -
ansible/roles/docker/tasks/deploy.yml | 5 -----
ansible/roles/invoker/tasks/clean.yml | 2 --
ansible/roles/invoker/tasks/deploy.yml | 1 -
ansible/roles/nginx/tasks/clean.yml | 2 --
ansible/roles/nginx/tasks/deploy.yml | 1 -
ansible/roles/prereq/tasks/clean.yml | 3 ---
ansible/roles/prereq/tasks/deploy.yml | 4 ----
ansible/roles/registry/tasks/clean.yml | 1 -
ansible/roles/registry/tasks/deploy.yml | 1 -
ansible/roles/sdk/tasks/clean.yml | 1 -
tools/travis/build.sh | 1 +
16 files changed, 1 insertion(+), 27 deletions(-)
diff --git a/ansible/registry.yml b/ansible/registry.yml
index f58d379..2c3a415 100644
--- a/ansible/registry.yml
+++ b/ansible/registry.yml
@@ -14,7 +14,6 @@
# publish cert on all hosts
- hosts: all:!ansible
- become: true
tasks:
- include: roles/registry/tasks/publish.yml
when: mode == "deploy" and registry.gencert
diff --git a/ansible/roles/cli/tasks/clean.yml b/ansible/roles/cli/tasks/clean.yml
index eb94b90..e9f7a3f 100644
--- a/ansible/roles/cli/tasks/clean.yml
+++ b/ansible/roles/cli/tasks/clean.yml
@@ -4,4 +4,3 @@
file:
path: "{{ cli.nginxdir }}"
state: absent
- become: true
diff --git a/ansible/roles/controller/tasks/clean.yml b/ansible/roles/controller/tasks/clean.yml
index 2850756..f2a7432 100644
--- a/ansible/roles/controller/tasks/clean.yml
+++ b/ansible/roles/controller/tasks/clean.yml
@@ -12,7 +12,6 @@
file:
path: "{{ whisk_logs_dir }}/controller{{ groups['controllers'].index(inventory_hostname) }}"
state: absent
- become: true
# Remove controller without prefix
- name: remove controller
@@ -26,4 +25,3 @@
file:
path: "{{ whisk_logs_dir }}/controller"
state: absent
- become: true
diff --git a/ansible/roles/controller/tasks/deploy.yml b/ansible/roles/controller/tasks/deploy.yml
index 3f62ca9..a78dc43 100644
--- a/ansible/roles/controller/tasks/deploy.yml
+++ b/ansible/roles/controller/tasks/deploy.yml
@@ -14,7 +14,6 @@
path: "{{ whisk_logs_dir }}/controller{{ groups['controllers'].index(inventory_hostname) }}"
state: directory
mode: 0777
- become: true
- name: (re)start controller
docker_container:
diff --git a/ansible/roles/docker/tasks/clean.yml b/ansible/roles/docker/tasks/clean.yml
index 72329f8..476fa46 100644
--- a/ansible/roles/docker/tasks/clean.yml
+++ b/ansible/roles/docker/tasks/clean.yml
@@ -6,4 +6,3 @@
name: docker-engine
state: absent
force: yes
- become: true
diff --git a/ansible/roles/docker/tasks/deploy.yml b/ansible/roles/docker/tasks/deploy.yml
index 62252d9..508aa9d 100644
--- a/ansible/roles/docker/tasks/deploy.yml
+++ b/ansible/roles/docker/tasks/deploy.yml
@@ -6,30 +6,25 @@
repo: deb https://apt.dockerproject.org/repo ubuntu-trusty main
update_cache: yes
state: present
- become: true
- name: install docker
apt:
name: "docker-engine={{ docker.version }}"
state: present
force: yes
- become: true
- name: configure docker
template:
src: docker.j2
dest: "/etc/default/docker"
- become: true
- name: add user to docker group
user:
name: "{{docker.user|default(ansible_user_id)}}"
groups: docker
append: true
- become: true
- name: restart docker service
service:
name: docker
state: restarted
- become: true
diff --git a/ansible/roles/invoker/tasks/clean.yml b/ansible/roles/invoker/tasks/clean.yml
index 12b503f..9992327 100644
--- a/ansible/roles/invoker/tasks/clean.yml
+++ b/ansible/roles/invoker/tasks/clean.yml
@@ -21,7 +21,6 @@
echo "Handled $TOTAL remaining actions."
register: runc_output
ignore_errors: True
- become: True
- debug: msg="{{ runc_output.stdout }}"
@@ -37,4 +36,3 @@
file:
path: "{{ whisk_logs_dir }}/invoker{{ groups['invokers'].index(inventory_hostname) }}"
state: absent
- become: true
diff --git a/ansible/roles/invoker/tasks/deploy.yml b/ansible/roles/invoker/tasks/deploy.yml
index 3fc828a..75643ab 100644
--- a/ansible/roles/invoker/tasks/deploy.yml
+++ b/ansible/roles/invoker/tasks/deploy.yml
@@ -35,7 +35,6 @@
path: "{{ whisk_logs_dir }}/invoker{{ groups['invokers'].index(inventory_hostname) }}"
state: directory
mode: 0777
- become: true
- name: define options when deploying invoker on Ubuntu
set_fact:
diff --git a/ansible/roles/nginx/tasks/clean.yml b/ansible/roles/nginx/tasks/clean.yml
index b8bc04e..b4a88be 100644
--- a/ansible/roles/nginx/tasks/clean.yml
+++ b/ansible/roles/nginx/tasks/clean.yml
@@ -12,10 +12,8 @@
file:
path: "{{ nginx.confdir }}"
state: absent
- become: true
- name: remove nginx log directory
file:
path: "{{ whisk_logs_dir }}/nginx"
state: absent
- become: true
diff --git a/ansible/roles/nginx/tasks/deploy.yml b/ansible/roles/nginx/tasks/deploy.yml
index c5b48f3..f70cea0 100644
--- a/ansible/roles/nginx/tasks/deploy.yml
+++ b/ansible/roles/nginx/tasks/deploy.yml
@@ -31,7 +31,6 @@
path: "{{ whisk_logs_dir }}/nginx"
state: directory
mode: 0777
- become: true
- name: "pull the nginx:{{ nginx.version }} image"
shell: "docker pull nginx:{{ nginx.version }}"
diff --git a/ansible/roles/prereq/tasks/clean.yml b/ansible/roles/prereq/tasks/clean.yml
index 4e76035..fbebbdf 100644
--- a/ansible/roles/prereq/tasks/clean.yml
+++ b/ansible/roles/prereq/tasks/clean.yml
@@ -5,16 +5,13 @@
pip:
name: requests
state: absent
- become: true
- name: remove docker
pip:
name: docker
state: absent
- become: true
- name: remove httplib2
pip:
name: httplib2
state: absent
- become: true
diff --git a/ansible/roles/prereq/tasks/deploy.yml b/ansible/roles/prereq/tasks/deploy.yml
index 8c70631..9b860d2 100644
--- a/ansible/roles/prereq/tasks/deploy.yml
+++ b/ansible/roles/prereq/tasks/deploy.yml
@@ -8,23 +8,19 @@
- name: install pip
shell: "curl -k https://bootstrap.pypa.io/get-pip.py | python"
- become: true
when: pip_result.rc != 0
- name: install requests
pip:
name: requests
version: 2.10.0
- become: true
- name: install docker for python
pip:
name: docker
version: 2.2.1
- become: true
- name: install httplib2
pip:
name: httplib2
version: 0.9.2
- become: true
diff --git a/ansible/roles/registry/tasks/clean.yml b/ansible/roles/registry/tasks/clean.yml
index 9d57102..c067008 100644
--- a/ansible/roles/registry/tasks/clean.yml
+++ b/ansible/roles/registry/tasks/clean.yml
@@ -9,4 +9,3 @@
file:
path: "/etc/cron.daily/recycle-registry.py"
state: absent
- become: true
diff --git a/ansible/roles/registry/tasks/deploy.yml b/ansible/roles/registry/tasks/deploy.yml
index c15f38d..f12fe90 100644
--- a/ansible/roles/registry/tasks/deploy.yml
+++ b/ansible/roles/registry/tasks/deploy.yml
@@ -63,4 +63,3 @@
src: recycle-registry.py.j2
dest: "/etc/cron.daily/recycle-registry"
mode: 0755
- become: true
diff --git a/ansible/roles/sdk/tasks/clean.yml b/ansible/roles/sdk/tasks/clean.yml
index ca04b53..4ffded3 100644
--- a/ansible/roles/sdk/tasks/clean.yml
+++ b/ansible/roles/sdk/tasks/clean.yml
@@ -5,4 +5,3 @@
file:
path: "{{ nginx.confdir }}/blackbox-0.1.0.tar.gz"
state: absent
- become: true
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index 9813c96..f5eead6 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -6,6 +6,7 @@ set -e
SCRIPTDIR=$(cd $(dirname "$0") && pwd)
ROOTDIR="$SCRIPTDIR/../.."
HOMEDIR="$SCRIPTDIR/../../../"
+export PYTHONPATH=/opt/python/2.7.13/lib/python2.7/site-packages
# clone the openwhisk utilities repo.
cd $HOMEDIR
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].