From 4100be27befd3fbca38ad82d95aaacd5a81898f6 Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Tue, 8 Jan 2019 15:05:49 +0000
Subject: [PATCH] Replace deprecated ansible --sudo with --become

Solves annoying warnings and prevents code from breaking on newer
ansible which dropped --sudo.

The sudo command line option has been deprecated in
favor of the "become" command line arguments. This feature will be removed in
version 2.6. Deprecation warnings can be disabled by setting
deprecation_warnings=False in ansible.cfg.

Change-Id: I0ec17d6bd6a1e3ada366c323ad67e864a7f1b5ed
---
 devstack-vm-gate.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 939f9b83..4d92d323 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -78,15 +78,15 @@ function setup_ssh {
     # node and all of the subnodes.
     local path=$1
     local dest_file=${2:-id_rsa}
-    $ANSIBLE all --sudo -f 5 -i "$WORKSPACE/inventory" -m file \
+    $ANSIBLE all --become -f 5 -i "$WORKSPACE/inventory" -m file \
         -a "path='$path' mode=0700 state=directory"
     # Note that we append to the authorized keys file just in case something
     # is already authorized to ssh with content in that file.
-    $ANSIBLE all --sudo -f 5 -i "$WORKSPACE/inventory" -m lineinfile \
+    $ANSIBLE all --become -f 5 -i "$WORKSPACE/inventory" -m lineinfile \
         -a "line={{ lookup('file', '/etc/nodepool/id_rsa.pub') }} dest='$path/authorized_keys' insertafter=EOF create=yes mode=0600"
-    $ANSIBLE all --sudo -f 5 -i "$WORKSPACE/inventory" -m copy \
+    $ANSIBLE all --become -f 5 -i "$WORKSPACE/inventory" -m copy \
         -a "src=/etc/nodepool/id_rsa.pub dest='$path/${dest_file}.pub' mode=0600"
-    $ANSIBLE all --sudo -f 5 -i "$WORKSPACE/inventory" -m copy \
+    $ANSIBLE all --become -f 5 -i "$WORKSPACE/inventory" -m copy \
         -a "src=/etc/nodepool/id_rsa dest='$path/${dest_file}' mode=0400"
 }
 
@@ -212,7 +212,7 @@ function setup_multinode_connectivity {
         ssh-keyscan $HOSTNAME >> /tmp/tmp_ssh_known_hosts
     done
 
-    $ANSIBLE all --sudo -f 5 -i "$WORKSPACE/inventory" -m copy \
+    $ANSIBLE all --become -f 5 -i "$WORKSPACE/inventory" -m copy \
             -a "src=/tmp/tmp_ssh_known_hosts dest=/etc/ssh/ssh_known_hosts mode=0444"
 
     for NODE in $sub_nodes; do
@@ -654,10 +654,10 @@ function setup_localrc {
 function setup_access_for_stack_user {
     # Make the workspace owned by the stack user
     # It is not clear if the ansible file module can do this for us
-    $ANSIBLE all --sudo -f 5 -i "$WORKSPACE/inventory" -m shell \
+    $ANSIBLE all --become -f 5 -i "$WORKSPACE/inventory" -m shell \
         -a "chown -R stack:stack '$BASE'"
     # allow us to add logs
-    $ANSIBLE all --sudo -f 5 -i "$WORKSPACE/inventory" -m shell \
+    $ANSIBLE all --become -f 5 -i "$WORKSPACE/inventory" -m shell \
         -a "chmod 777 '$WORKSPACE/logs'"
 }
 
@@ -754,9 +754,9 @@ else
     if [ -d "$BASE/data/CA" ] && [ -f "$BASE/data/ca-bundle.pem" ] ; then
         # Sync any data files which include certificates to be used if
         # TLS is enabled
-        $ANSIBLE subnodes -f 5 -i "$WORKSPACE/inventory" --sudo -m file \
+        $ANSIBLE subnodes -f 5 -i "$WORKSPACE/inventory" --become -m file \
             -a "path='$BASE/data' state=directory owner=stack group=stack mode=0755"
-        $ANSIBLE subnodes -f 5 -i "$WORKSPACE/inventory" --sudo -m file \
+        $ANSIBLE subnodes -f 5 -i "$WORKSPACE/inventory" --become -m file \
             -a "path='$BASE/data/CA' state=directory owner=stack group=stack mode=0755"
         $ANSIBLE subnodes -f 5 -i "$WORKSPACE/inventory" \
             --sudo -m synchronize \