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/09/07 15:02:03 UTC
[incubator-openwhisk] branch master updated: Fix Ansible playbook
problems with missing variable interpolation (#2709)
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 079ba9b Fix Ansible playbook problems with missing variable interpolation (#2709)
079ba9b is described below
commit 079ba9b0e0dae827224237dd8f821855e330da65
Author: Sven Lange-Last <sv...@de.ibm.com>
AuthorDate: Thu Sep 7 17:02:00 2017 +0200
Fix Ansible playbook problems with missing variable interpolation (#2709)
Surround variables introduced with PR #2669 with double curly braces to force interpolation.
We observed Ansible playbook runs where `become` was not active because variables
were not interpolated such that the value was `false`.
---
ansible/roles/cli/tasks/clean.yml | 2 +-
ansible/roles/cli/tasks/deploy.yml | 2 +-
ansible/roles/controller/tasks/clean.yml | 2 +-
ansible/roles/controller/tasks/deploy.yml | 2 +-
ansible/roles/invoker/tasks/clean.yml | 4 ++--
ansible/roles/invoker/tasks/deploy.yml | 2 +-
ansible/roles/nginx/tasks/clean.yml | 4 ++--
ansible/roles/nginx/tasks/deploy.yml | 4 ++--
ansible/roles/sdk/tasks/clean.yml | 2 +-
ansible/roles/sdk/tasks/deploy.yml | 2 +-
10 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ansible/roles/cli/tasks/clean.yml b/ansible/roles/cli/tasks/clean.yml
index 4a5fce9..6c365ab 100644
--- a/ansible/roles/cli/tasks/clean.yml
+++ b/ansible/roles/cli/tasks/clean.yml
@@ -4,4 +4,4 @@
file:
path: "{{ cli.nginxdir }}"
state: absent
- become: cli.dir.become
+ become: "{{ cli.dir.become }}"
diff --git a/ansible/roles/cli/tasks/deploy.yml b/ansible/roles/cli/tasks/deploy.yml
index 1189f2d..3961ab8 100644
--- a/ansible/roles/cli/tasks/deploy.yml
+++ b/ansible/roles/cli/tasks/deploy.yml
@@ -5,7 +5,7 @@
file:
path: "{{ cli.nginxdir }}"
state: directory
- become: cli.dir.become
+ become: "{{ cli.dir.become }}"
- set_fact:
cli_installation_mode="{{ openwhisk_cli.installation_mode }}"
diff --git a/ansible/roles/controller/tasks/clean.yml b/ansible/roles/controller/tasks/clean.yml
index ad316d1..e3bbe07 100644
--- a/ansible/roles/controller/tasks/clean.yml
+++ b/ansible/roles/controller/tasks/clean.yml
@@ -12,4 +12,4 @@
file:
path: "{{ whisk_logs_dir }}/controller{{ groups['controllers'].index(inventory_hostname) }}"
state: absent
- become: logs.dir.become
+ become: "{{ logs.dir.become }}"
diff --git a/ansible/roles/controller/tasks/deploy.yml b/ansible/roles/controller/tasks/deploy.yml
index 73b8759..b055a63 100644
--- a/ansible/roles/controller/tasks/deploy.yml
+++ b/ansible/roles/controller/tasks/deploy.yml
@@ -14,7 +14,7 @@
path: "{{ whisk_logs_dir }}/controller{{ groups['controllers'].index(inventory_hostname) }}"
state: directory
mode: 0777
- become: logs.dir.become
+ become: "{{ logs.dir.become }}"
- name: (re)start controller
docker_container:
diff --git a/ansible/roles/invoker/tasks/clean.yml b/ansible/roles/invoker/tasks/clean.yml
index fc41317..c5c9592 100644
--- a/ansible/roles/invoker/tasks/clean.yml
+++ b/ansible/roles/invoker/tasks/clean.yml
@@ -21,7 +21,7 @@
echo "Handled $TOTAL remaining actions."
register: runc_output
ignore_errors: True
- become: invoker.docker.become
+ become: "{{ invoker.docker.become }}"
- debug: msg="{{ runc_output.stdout }}"
@@ -37,4 +37,4 @@
file:
path: "{{ whisk_logs_dir }}/invoker{{ groups['invokers'].index(inventory_hostname) }}"
state: absent
- become: logs.dir.become
+ become: "{{ logs.dir.become }}"
diff --git a/ansible/roles/invoker/tasks/deploy.yml b/ansible/roles/invoker/tasks/deploy.yml
index 605c1d1..8b6536e 100644
--- a/ansible/roles/invoker/tasks/deploy.yml
+++ b/ansible/roles/invoker/tasks/deploy.yml
@@ -35,7 +35,7 @@
path: "{{ whisk_logs_dir }}/invoker{{ groups['invokers'].index(inventory_hostname) }}"
state: directory
mode: 0777
- become: logs.dir.become
+ become: "{{ logs.dir.become }}"
- 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 0e39ec6..eada58d 100644
--- a/ansible/roles/nginx/tasks/clean.yml
+++ b/ansible/roles/nginx/tasks/clean.yml
@@ -12,10 +12,10 @@
file:
path: "{{ nginx.confdir }}"
state: absent
- become: nginx.dir.become
+ become: "{{ nginx.dir.become }}"
- name: remove nginx log directory
file:
path: "{{ whisk_logs_dir }}/nginx"
state: absent
- become: logs.dir.become
+ become: "{{ logs.dir.become }}"
diff --git a/ansible/roles/nginx/tasks/deploy.yml b/ansible/roles/nginx/tasks/deploy.yml
index 0a768bc..0a6531f 100644
--- a/ansible/roles/nginx/tasks/deploy.yml
+++ b/ansible/roles/nginx/tasks/deploy.yml
@@ -5,7 +5,7 @@
file:
path: "{{ nginx.confdir }}"
state: directory
- become: nginx.dir.become
+ become: "{{ nginx.dir.become }}"
- name: copy template from local to remote in nginx config directory
template:
@@ -32,7 +32,7 @@
path: "{{ whisk_logs_dir }}/nginx"
state: directory
mode: 0777
- become: logs.dir.become
+ become: "{{ logs.dir.become }}"
- name: "pull the nginx:{{ nginx.version }} image"
shell: "docker pull nginx:{{ nginx.version }}"
diff --git a/ansible/roles/sdk/tasks/clean.yml b/ansible/roles/sdk/tasks/clean.yml
index 2944e40..c9e83ed 100644
--- a/ansible/roles/sdk/tasks/clean.yml
+++ b/ansible/roles/sdk/tasks/clean.yml
@@ -5,4 +5,4 @@
file:
path: "{{ nginx.confdir }}/blackbox-0.1.0.tar.gz"
state: absent
- become: sdk.dir.become
+ become: "{{ sdk.dir.become }}"
diff --git a/ansible/roles/sdk/tasks/deploy.yml b/ansible/roles/sdk/tasks/deploy.yml
index ef68169..4b6b2de 100644
--- a/ansible/roles/sdk/tasks/deploy.yml
+++ b/ansible/roles/sdk/tasks/deploy.yml
@@ -5,7 +5,7 @@
file:
path: "{{ nginx.confdir }}"
state: directory
- become: sdk.dir.become
+ become: "{{ sdk.dir.become }}"
# Blackbox
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].