Replace deprecated sudo with become.

README_AEP.md

@@ -71,8 +71,8 @@ nodes
 # SSH user, this user should allow ssh based auth without requiring a password
 ansible_ssh_user=root
 
-# If ansible_ssh_user is not root, ansible_sudo must be set to true
-#ansible_sudo=true
+# If ansible_ssh_user is not root, ansible_become must be set to true
+#ansible_become=yes
 
 # See DEPLOYMENT_TYPES.md
 deployment_type=atomic-enterprise

inventory/aws/hosts/hosts

@@ -1 +1 @@
-localhost ansible_connection=local ansible_sudo=no ansible_python_interpreter='/usr/bin/env python2'
+localhost ansible_connection=local ansible_become=no ansible_python_interpreter='/usr/bin/env python2'

inventory/byo/hosts.aep.example

@@ -14,9 +14,9 @@ lb
 # ssh agent.
 ansible_ssh_user=root
 
-# If ansible_ssh_user is not root, ansible_sudo must be set to true and the
+# If ansible_ssh_user is not root, ansible_become must be set to true and the
 # user must be configured for passwordless sudo
-#ansible_sudo=true
+#ansible_become=yes
 
 # Debug level for all Atomic Enterprise components (Defaults to 2)
 debug_level=2

inventory/byo/hosts.openstack

@@ -10,7 +10,7 @@ lb
 # Set variables common for all OSEv3 hosts
 [OSEv3:vars]
 ansible_ssh_user=cloud-user
-ansible_sudo=true
+ansible_become=yes
 
 # Debug level for all OpenShift components (Defaults to 2)
 debug_level=2

inventory/byo/hosts.origin.example

@@ -15,9 +15,9 @@ nfs
 # ssh agent.
 ansible_ssh_user=root
 
-# If ansible_ssh_user is not root, ansible_sudo must be set to true and the
+# If ansible_ssh_user is not root, ansible_become must be set to true and the
 # user must be configured for passwordless sudo
-#ansible_sudo=true
+#ansible_become=yes
 
 # Debug level for all OpenShift components (Defaults to 2)
 debug_level=2

inventory/byo/hosts.ose.example

@@ -14,9 +14,9 @@ lb
 # ssh agent.
 ansible_ssh_user=root
 
-# If ansible_ssh_user is not root, ansible_sudo must be set to true and the
+# If ansible_ssh_user is not root, ansible_become must be set to true and the
 # user must be configured for passwordless sudo
-#ansible_sudo=true
+#ansible_become=yes
 
 # Debug level for all OpenShift components (Defaults to 2)
 debug_level=2

inventory/gce/hosts/hosts

@@ -1 +1 @@
-localhost ansible_connection=local ansible_sudo=no ansible_python_interpreter='/usr/bin/env python2'
+localhost ansible_connection=local ansible_become=no ansible_python_interpreter='/usr/bin/env python2'

inventory/libvirt/hosts/hosts

@@ -1 +1 @@
-localhost ansible_connection=local ansible_sudo=no ansible_python_interpreter='/usr/bin/env python2'
+localhost ansible_connection=local ansible_become=no ansible_python_interpreter='/usr/bin/env python2'

inventory/openstack/hosts/hosts

@@ -1 +1 @@
-localhost ansible_sudo=no ansible_python_interpreter='/usr/bin/env python2' connection=local
+localhost ansible_become=no ansible_python_interpreter='/usr/bin/env python2' connection=local

playbooks/adhoc/atomic_openshift_tutorial_reset.yml

@@ -8,7 +8,7 @@
 - hosts:
     - OSEv3:children
 
-  sudo: yes
+  become: yes
 
   tasks:
     - shell: docker ps -a -q | xargs docker stop

playbooks/adhoc/setupnfs.yml

@@ -1,7 +1,7 @@
 ---
 ### This playbook is old and we are currently not using NFS.
 - hosts: tag_Name_nfs-v3-stg
-  sudo: no
+  become: no
   remote_user: root
   gather_facts: no
   roles:

playbooks/adhoc/uninstall.yml

@@ -10,7 +10,7 @@
 - hosts:
     - OSEv3:children
 
-  sudo: yes
+  become: yes
 
   tasks:
     - name: Detecting Operating System
@@ -243,7 +243,7 @@
       command: systemctl daemon-reload
 
 - hosts: nodes
-  sudo: yes
+  become: yes
   tasks:
     - name: restart docker
       service: name=docker state=restarted

playbooks/aws/openshift-cluster/list.yml

@@ -15,7 +15,7 @@
       name: "{{ item }}"
       groups: oo_list_hosts
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     with_items: groups[scratch_group] | default([]) | difference(['localhost'])
 
 - name: List Hosts

playbooks/aws/openshift-cluster/scaleup.yml

@@ -12,7 +12,7 @@
       name: "{{ item }}"
       groups: oo_hosts_to_update
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     with_items: "{{ groups.nodes_to_add }}"
 
 - include: ../../common/openshift-cluster/update_repos_and_packages.yml

playbooks/aws/openshift-cluster/service.yml

@@ -16,7 +16,7 @@
       name: "{{ item }}"
       groups: g_service_masters
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     with_items: "{{ master_hosts | default([]) }}"
 
   - name: Evaluate g_service_nodes
@@ -24,7 +24,7 @@
       name: "{{ item }}"
       groups: g_service_nodes
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     with_items: "{{ node_hosts | default([]) }}"
 
 - include: ../../common/openshift-node/service.yml

playbooks/aws/openshift-cluster/tasks/launch_instances.yml

@@ -173,7 +173,7 @@
     hostname: "{{ item.0 }}"
     ansible_ssh_host: "{{ item.1.dns_name }}"
     ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-    ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+    ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     groups: "{{ instance_groups }}"
     ec2_private_ip_address: "{{ item.1.private_ip }}"
     ec2_ip_address: "{{ item.1.public_ip }}"
@@ -188,7 +188,7 @@
     hostname: "{{ item.0 }}"
     ansible_ssh_host: "{{ item.1.dns_name }}"
     ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-    ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+    ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     groups: nodes_to_add
     ec2_private_ip_address: "{{ item.1.private_ip }}"
     ec2_ip_address: "{{ item.1.public_ip }}"

playbooks/aws/openshift-cluster/terminate.yml

@@ -11,7 +11,7 @@
       name: "{{ item }}"
       groups: oo_hosts_to_terminate
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     with_items: (groups['tag_clusterid_' ~ cluster_id] | default([])) | difference(['localhost'])
 
 - name: Unsubscribe VMs

playbooks/aws/openshift-cluster/update.yml

@@ -13,7 +13,7 @@
       name: "{{ item }}"
       groups: oo_hosts_to_update
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     with_items: "{{ g_all_hosts | default([]) }}"
 
 - include: ../../common/openshift-cluster/update_repos_and_packages.yml

playbooks/aws/openshift-cluster/vars.yml

@@ -7,7 +7,7 @@ deployment_rhel7_ent_base:
   image_name:
   region: us-east-1
   ssh_user: ec2-user
-  sudo: yes
+  become: yes
   keypair: libra
   type: m4.large
   security_groups: [ 'public' ]
@@ -21,7 +21,7 @@ deployment_vars:
     image_name:
     region: us-east-1
     ssh_user: centos
-    sudo: yes
+    become: yes
     keypair: libra
     type: m4.large
     security_groups: [ 'public' ]
@@ -33,7 +33,7 @@ deployment_vars:
     image_name: openshift-rhel7_*
     region: us-east-1
     ssh_user: root
-    sudo: no
+    become: no
     keypair: libra
     type: m4.large
     security_groups: [ 'public' ]

playbooks/common/openshift-cluster/evaluate_groups.yml

@@ -34,7 +34,7 @@
       name: "{{ item }}"
       groups: oo_all_hosts
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
-      ansible_sudo: "{{ g_sudo | default(omit) }}"
+      ansible_become: "{{ g_sudo | default(omit) }}"
     with_items: "{{ g_all_hosts | default([]) }}"
 
   - name: Evaluate oo_masters
@@ -42,7 +42,7 @@
       name: "{{ item }}"
       groups: oo_masters
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
-      ansible_sudo: "{{ g_sudo | default(omit) }}"
+      ansible_become: "{{ g_sudo | default(omit) }}"
     with_items: "{{ g_master_hosts | union(g_new_master_hosts) | default([]) }}"
 
   - name: Evaluate oo_etcd_to_config
@@ -50,7 +50,7 @@
       name: "{{ item }}"
       groups: oo_etcd_to_config
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
-      ansible_sudo: "{{ g_sudo | default(omit) }}"
+      ansible_become: "{{ g_sudo | default(omit) }}"
     with_items: "{{ g_etcd_hosts | default([]) }}"
 
   - name: Evaluate oo_masters_to_config
@@ -58,7 +58,7 @@
       name: "{{ item }}"
       groups: oo_masters_to_config
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
-      ansible_sudo: "{{ g_sudo | default(omit) }}"
+      ansible_become: "{{ g_sudo | default(omit) }}"
     with_items: "{{ g_new_master_hosts | default(g_master_hosts | default([], true), true) }}"
 
   - name: Evaluate oo_nodes_to_config
@@ -66,7 +66,7 @@
       name: "{{ item }}"
       groups: oo_nodes_to_config
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
-      ansible_sudo: "{{ g_sudo | default(omit) }}"
+      ansible_become: "{{ g_sudo | default(omit) }}"
     with_items: "{{ g_new_node_hosts | default(g_node_hosts | default([], true), true) }}"
 
   # Skip adding the master to oo_nodes_to_config when g_new_node_hosts is
@@ -75,7 +75,7 @@
       name: "{{ item }}"
       groups: oo_nodes_to_config
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
-      ansible_sudo: "{{ g_sudo | default(omit) }}"
+      ansible_become: "{{ g_sudo | default(omit) }}"
     with_items: "{{ g_master_hosts | default([]) }}"
     when: g_nodeonmaster | default(false) == true and g_new_node_hosts is not defined
 
@@ -91,7 +91,7 @@
       name: "{{ g_master_hosts[0] }}"
       groups: oo_first_master
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
-      ansible_sudo: "{{ g_sudo | default(omit) }}"
+      ansible_become: "{{ g_sudo | default(omit) }}"
     when: g_master_hosts|length > 0
 
   - name: Evaluate oo_lb_to_config
@@ -99,7 +99,7 @@
       name: "{{ item }}"
       groups: oo_lb_to_config
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
-      ansible_sudo: "{{ g_sudo | default(omit) }}"
+      ansible_become: "{{ g_sudo | default(omit) }}"
     with_items: "{{ g_lb_hosts | default([]) }}"
 
   - name: Evaluate oo_nfs_to_config
@@ -107,5 +107,5 @@
       name: "{{ item }}"
       groups: oo_nfs_to_config
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
-      ansible_sudo: "{{ g_sudo | default(omit) }}"
+      ansible_become: "{{ g_sudo | default(omit) }}"
     with_items: "{{ g_nfs_hosts | default([]) }}"

playbooks/common/openshift-master/restart.yml

@@ -97,7 +97,7 @@
       name: "{{ item }}"
       groups: oo_active_masters
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
-      ansible_sudo: "{{ g_sudo | default(omit) }}"
+      ansible_become: "{{ g_sudo | default(omit) }}"
     with_items: "{{ groups.oo_masters_to_config | default([]) }}"
     when: (hostvars[item]['is_active'] | default(false)) | bool
   - name: Evaluate oo_current_masters
@@ -105,7 +105,7 @@
       name: "{{ item }}"
       groups: oo_current_masters
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
-      ansible_sudo: "{{ g_sudo | default(omit) }}"
+      ansible_become: "{{ g_sudo | default(omit) }}"
     with_items: "{{ groups.oo_masters_to_config | default([]) }}"
     when: (hostvars[item]['current_host'] | default(false)) | bool
 

playbooks/common/openshift-node/config.yml

@@ -105,7 +105,7 @@
       name: "{{ item }}"
       groups: oo_containerized_master_nodes
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
-      ansible_sudo: "{{ g_sudo | default(omit) }}"
+      ansible_become: "{{ g_sudo | default(omit) }}"
     with_items: "{{ groups.oo_nodes_to_config | default([]) }}"
     when: hostvars[item].openshift.common.is_containerized | bool and (item in groups.oo_nodes_to_config and item in groups.oo_masters_to_config)
 

playbooks/gce/openshift-cluster/list.yml

@@ -15,7 +15,7 @@
       name: "{{ item }}"
       groups: oo_list_hosts
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     with_items: groups[scratch_group] | default([], true) | difference(['localhost']) | difference(groups.status_terminated | default([], true))
 
 - name: List Hosts

playbooks/gce/openshift-cluster/service.yml

@@ -15,14 +15,14 @@
       name: "{{ item }}"
       groups: g_service_nodes
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     with_items: "{{ node_hosts | default([]) | difference(['localhost']) | difference(groups.status_terminated) }}"
 
   - add_host:
       name: "{{ item }}"
       groups: g_service_masters
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     with_items: "{{ master_hosts | default([]) | difference(['localhost']) | difference(groups.status_terminated) }}"
 
 - include: ../../common/openshift-node/service.yml

playbooks/gce/openshift-cluster/tasks/launch_instances.yml

@@ -39,7 +39,7 @@
     hostname: "{{ item.name }}"
     ansible_ssh_host: "{{ item.public_ip }}"
     ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-    ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+    ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     groups: "{{ item.tags | oo_prepend_strings_in_list('tag_') | join(',') }}"
     gce_public_ip: "{{ item.public_ip }}"
     gce_private_ip: "{{ item.private_ip }}"

playbooks/gce/openshift-cluster/terminate.yml

@@ -11,7 +11,7 @@
       name: "{{ item }}"
       groups: oo_hosts_to_terminate
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     with_items: (groups['tag_clusterid-' ~ cluster_id] | default([])) | difference(['localhost'])
 
 - name: Unsubscribe VMs

playbooks/gce/openshift-cluster/update.yml

@@ -13,7 +13,7 @@
       name: "{{ item }}"
       groups: oo_hosts_to_update
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     with_items: "{{ g_all_hosts | default([]) }}"
 
 - include: ../../common/openshift-cluster/update_repos_and_packages.yml

playbooks/gce/openshift-cluster/vars.yml

@@ -5,19 +5,19 @@ deployment_rhel7_ent_base:
   image: "{{ lookup('oo_option', 'image_name') | default('rhel-7', True) }}"
   machine_type: "{{ lookup('oo_option', 'machine_type') | default('n1-standard-1', True) }}"
   ssh_user: "{{ lookup('env', 'gce_ssh_user') |  default(ansible_ssh_user, true) }}"
-  sudo: yes
+  become: yes
 
 deployment_vars:
   origin:
     image: "{{ lookup('oo_option', 'image_name') | default('centos-7', True) }}"
     machine_type: "{{ lookup('oo_option', 'machine_type') | default('n1-standard-1', True) }}"
     ssh_user: "{{ lookup('env', 'gce_ssh_user') |  default(ansible_ssh_user, true) }}"
-    sudo: yes
+    become: yes
   online:
     image: libra-rhel7
     machine_type: n1-standard-1
     ssh_user: root
-    sudo: no
+    become: no
   enterprise: "{{ deployment_rhel7_ent_base }}"
   openshift-enterprise: "{{ deployment_rhel7_ent_base }}"
   atomic-enterprise: "{{ deployment_rhel7_ent_base }}"

playbooks/libvirt/openshift-cluster/list.yml

@@ -15,7 +15,7 @@
       name: "{{ item }}"
       groups: oo_list_hosts
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     with_items: groups[scratch_group] | default([]) | difference(['localhost'])
 
 - name: List Hosts

playbooks/libvirt/openshift-cluster/service.yml

@@ -18,7 +18,7 @@
     add_host:
       name: "{{ item }}"
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
       groups: g_service_masters
     with_items: "{{ g_master_hosts | default([]) }}"
 
@@ -26,7 +26,7 @@
     add_host:
       name: "{{ item }}"
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
       groups: g_service_nodes
     with_items: "{{ g_node_hosts | default([]) }}"
 

playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml

@@ -113,7 +113,7 @@
     hostname: '{{ item.0 }}'
     ansible_ssh_host: '{{ item.1 }}'
     ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-    ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+    ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     groups: "tag_environment-{{ cluster_env }}, tag_host-type-{{ type }}, tag_sub-host-type-{{ g_sub_host_type }}, tag_clusterid-{{ cluster_id }}"
     openshift_node_labels: "{{ node_label }}"
   with_together:

playbooks/libvirt/openshift-cluster/terminate.yml

@@ -14,7 +14,7 @@
       name: "{{ item }}"
       groups: oo_hosts_to_terminate
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     with_items: groups[cluster_group] | default([])
 
 - name: Unsubscribe VMs

playbooks/libvirt/openshift-cluster/update.yml

@@ -13,7 +13,7 @@
       name: "{{ item }}"
       groups: oo_hosts_to_update
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     with_items: "{{ g_all_hosts | default([]) }}"
 
 - include: ../../common/openshift-cluster/update_repos_and_packages.yml

playbooks/libvirt/openshift-cluster/vars.yml

@@ -20,7 +20,7 @@ deployment_rhel7_ent_base:
                 default('25f880767ec6bf71beb532e17f1c45231640bbfdfbbb1dffb79d2c1b328388e0', True) }}"
     compression: ""
   ssh_user: openshift
-  sudo: yes
+  become: yes
 
 deployment_vars:
   origin:
@@ -34,14 +34,14 @@ deployment_vars:
       sha256: "{{ lookup('oo_option', 'image_sha256') |
                   default('dd0f5e610e7c5ffacaca35ed7a78a19142a588f4543da77b61c1fb0d74400471', True) }}"
     ssh_user: openshift
-    sudo: yes
+    become: yes
   online:
     image:
       url:
       name:
       sha256:
     ssh_user: root
-    sudo: no
+    become: no
   enterprise: "{{ deployment_rhel7_ent_base }}"
   openshift-enterprise: "{{ deployment_rhel7_ent_base }}"
   atomic-enterprise: "{{ deployment_rhel7_ent_base }}"

playbooks/openstack/openshift-cluster/dns.yml

@@ -12,7 +12,7 @@
       name: "{{ item }}"
       groups: oo_dns_hosts_to_update
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     with_items: "{{ groups[cluster_id ~ '-dns'] }}"
 
   - name: Evaluate oo_hosts_to_add_in_dns
@@ -20,7 +20,7 @@
       name: "{{ item }}"
       groups: oo_hosts_to_add_in_dns
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     with_items: "{{ groups['tag_clusterid_' ~ cluster_id] }}"
 
 - name: Gather facts

playbooks/openstack/openshift-cluster/launch.yml

@@ -106,7 +106,7 @@
       hostname: '{{ item[0] }}'
       ansible_ssh_host: '{{ item[2] }}'
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
       groups: 'tag_environment_{{ cluster_env }}, tag_host-type_etcd, tag_sub-host-type_default, tag_clusterid_{{ cluster_id }}'
       openshift_node_labels:
         type: "etcd"
@@ -120,7 +120,7 @@
       hostname: '{{ item[0] }}'
       ansible_ssh_host: '{{ item[2] }}'
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
       groups: 'tag_environment_{{ cluster_env }}, tag_host-type_master, tag_sub-host-type_default, tag_clusterid_{{ cluster_id }}'
       openshift_node_labels:
         type: "master"
@@ -134,7 +134,7 @@
       hostname: '{{ item[0] }}'
       ansible_ssh_host: '{{ item[2] }}'
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
       groups: 'tag_environment_{{ cluster_env }}, tag_host-type_node, tag_sub-host-type_compute, tag_clusterid_{{ cluster_id }}'
       openshift_node_labels:
         type: "compute"
@@ -148,7 +148,7 @@
       hostname: '{{ item[0] }}'
       ansible_ssh_host: '{{ item[2] }}'
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
       groups: 'tag_environment_{{ cluster_env }}, tag_host-type_node, tag_sub-host-type_infra, tag_clusterid_{{ cluster_id }}'
       openshift_node_labels:
         type: "infra"
@@ -162,7 +162,7 @@
       hostname: '{{ parsed_outputs.dns_name }}'
       ansible_ssh_host: '{{ parsed_outputs.dns_floating_ip }}'
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
       groups: '{{ cluster_id }}-dns'
 
   - name: Wait for ssh

playbooks/openstack/openshift-cluster/list.yml

@@ -16,7 +16,7 @@
       groups: oo_list_hosts
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
       ansible_ssh_host: "{{ hostvars[item].ansible_ssh_host | default(item) }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     with_items: groups[scratch_group] | default([]) | difference(['localhost'])
 
 - name: List Hosts

playbooks/openstack/openshift-cluster/terminate.yml

@@ -10,7 +10,7 @@
       name: "{{ item }}"
       groups: oo_hosts_to_terminate
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     with_items: (groups['tag_environment_' ~ cluster_env]|default([])) | intersect(groups['tag_clusterid_' ~ cluster_id ]|default([]))
 
 - name: Unsubscribe VMs

playbooks/openstack/openshift-cluster/update.yml

@@ -15,7 +15,7 @@
       name: "{{ item }}"
       groups: oo_hosts_to_update
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"
     with_items: "{{ g_all_hosts | default([]) }}"
 
 - include: ../../common/openshift-cluster/update_repos_and_packages.yml

playbooks/openstack/openshift-cluster/vars.yml

@@ -21,17 +21,17 @@ openstack_flavor:
 deployment_rhel7_ent_base:
   image: "{{ lookup('oo_option', 'image_name') | default('rhel-guest-image-7.2-20151102.0.x86_64', True) }}"
   ssh_user: openshift
-  sudo: yes
+  become: yes
 
 deployment_vars:
   origin:
     image: "{{ lookup('oo_option', 'image_name') | default('centos-70-raw', True) }}"
     ssh_user: openshift
-    sudo: yes
+    become: yes
   online:
     image:
     ssh_user: root
-    sudo: no
+    become: no
   enterprise: "{{ deployment_rhel7_ent_base }}"
   openshift-enterprise: "{{ deployment_rhel7_ent_base }}"
   atomic-enterprise: "{{ deployment_rhel7_ent_base }}"

roles/flannel/handlers/main.yml

@@ -1,8 +1,8 @@
 ---
 - name: restart flanneld
-  sudo: true
+  become: yes
   service: name=flanneld state=restarted
 
 - name: restart docker
-  sudo: true
+  become: yes
   service: name=docker state=restarted

roles/flannel/tasks/main.yml

@@ -1,11 +1,11 @@
 ---
 - name: Install flannel
-  sudo: true
+  become: yes
   action: "{{ ansible_pkg_mgr }} name=flannel state=present"
   when: not openshift.common.is_containerized | bool
 
 - name: Set flannel etcd url
-  sudo: true
+  become: yes
   lineinfile:
     dest: /etc/sysconfig/flanneld
     backrefs: yes
@@ -13,7 +13,7 @@
     line: '\1{{ etcd_hosts|join(",") }}'
 
 - name: Set flannel etcd key
-  sudo: true
+  become: yes
   lineinfile:
     dest: /etc/sysconfig/flanneld
     backrefs: yes
@@ -21,7 +21,7 @@
     line: '\1{{ flannel_etcd_key }}'
 
 - name: Set flannel options
-  sudo: true
+  become: yes
   lineinfile:
     dest: /etc/sysconfig/flanneld
     backrefs: yes
@@ -29,7 +29,7 @@
     line: '\1--iface {{ flannel_interface }} --etcd-cafile={{ etcd_peer_ca_file }} --etcd-keyfile={{ etcd_peer_key_file }} --etcd-certfile={{ etcd_peer_cert_file }}'
 
 - name: Enable flanneld
-  sudo: true
+  become: yes
   service:
     name: flanneld
     state: started
@@ -37,7 +37,7 @@
   register: start_result
 
 - name: Remove docker bridge ip
-  sudo: true
+  become: yes
   shell: ip a del `ip a show docker0 | grep "inet[[:space:]]" | awk '{print $2}'` dev docker0
   notify:
     - restart docker

roles/flannel_register/tasks/main.yml

@@ -1,14 +1,14 @@
 ---
 - name: Assures /etc/flannel dir exists
-  sudo: true
+  become: yes
   file: path=/etc/flannel state=directory
 
 - name: Generate etcd configuration for etcd
-  sudo: true
+  become: yes
   template:
     src: "flannel-config.json"
     dest: "/etc/flannel/config.json"
 
 - name: Insert flannel configuration into etcd
-  sudo: true
+  become: yes
   command: 'curl -L --cacert "{{ etcd_peer_ca_file }}" --cert "{{ etcd_peer_cert_file }}" --key "{{ etcd_peer_key_file }}" "{{ etcd_hosts[0] }}/v2/keys{{ flannel_etcd_key }}/config" -XPUT --data-urlencode value@/etc/flannel/config.json'

roles/kube_nfs_volumes/README.md

@@ -94,7 +94,7 @@ partitions.
 * Create an ansible playbook, say `setupnfs.yaml`:
     ```
     - hosts: nfsservers
-      sudo: yes
+      become: yes
       roles:
          - role: kube_nfs_volumes
            disks: "/dev/sdb,/dev/sdc"

roles/nuage_master/handlers/main.yaml

@@ -1,6 +1,6 @@
 ---
 - name: restart nuage-openshift-monitor
-  sudo: true
+  become: yes
   service: name=nuage-openshift-monitor state=restarted
 
 - name: restart master

roles/nuage_master/tasks/main.yaml

@@ -1,20 +1,20 @@
 ---
 - name: Create directory /usr/share/nuage-openshift-monitor
-  sudo: true
+  become: yes
   file: path=/usr/share/nuage-openshift-monitor state=directory  
 
 - name: Create the log directory
-  sudo: true
+  become: yes
   file: path={{ nuage_mon_rest_server_logdir }} state=directory
 
 - name: Install Nuage Openshift Monitor 
-  sudo: true
+  become: yes
   yum: name={{ nuage_openshift_rpm }} state=present
 
 - include: serviceaccount.yml
 
 - name: Download the certs and keys
-  sudo: true
+  become: yes
   fetch: src={{ cert_output_dir }}/{{ item }} dest=/tmp/{{ item }} flat=yes
   with_items:
         - ca.crt
@@ -25,7 +25,7 @@
 - include: certificates.yml 
 
 - name: Create nuage-openshift-monitor.yaml
-  sudo: true
+  become: yes
   template: src=nuage-openshift-monitor.j2 dest=/usr/share/nuage-openshift-monitor/nuage-openshift-monitor.yaml owner=root mode=0644
   notify:
     - restart master

roles/nuage_node/handlers/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: restart vrs
-  sudo: true
+  become: yes
   service: name=openvswitch state=restarted
 
 - name: restart node
-  sudo: true
+  become: yes
   service: name={{ openshift.common.service_type }}-node state=restarted

roles/nuage_node/tasks/main.yaml

@@ -1,27 +1,27 @@
 ---
 - name: Install Nuage VRS
-  sudo: true
+  become: yes
   yum: name={{ vrs_rpm }} state=present
   
 - name: Set the uplink interface 
-  sudo: true
+  become: yes
   lineinfile: dest={{ vrs_config }} regexp=^NETWORK_UPLINK_INTF line='NETWORK_UPLINK_INTF={{ uplink_interface }}'
 
 - name: Set the Active Controller 
-  sudo: true
+  become: yes
   lineinfile: dest={{ vrs_config }} regexp=^ACTIVE_CONTROLLER line='ACTIVE_CONTROLLER={{ vsc_active_ip }}'
 
 - name: Set the Standby Controller 
-  sudo: true
+  become: yes
   lineinfile: dest={{ vrs_config }} regexp=^STANDBY_CONTROLLER line='STANDBY_CONTROLLER={{ vsc_standby_ip }}'
   when: vsc_standby_ip is defined
 
 - name: Install plugin rpm
-  sudo: true
+  become: yes
   yum: name={{ plugin_rpm }} state=present
 
 - name: Copy the certificates and keys
-  sudo: true
+  become: yes
   copy: src="/tmp/{{ item }}" dest="{{ vsp_openshift_dir }}/{{ item }}"
   with_items:
         - ca.crt
@@ -32,7 +32,7 @@
 - include: certificates.yml
 
 - name: Set the vsp-openshift.yaml 
-  sudo: true
+  become: yes
   template: src=vsp-openshift.j2 dest={{ vsp_openshift_yaml }} owner=root mode=0644 
   notify:
     - restart vrs

roles/openshift_expand_partition/README.md

@@ -45,7 +45,7 @@ space on /dev/xvda, and the file system will be expanded to fill the new
 partition space.
 
     - hosts: mynodes
-      sudo: no
+      become: no
       remote_user: root
       gather_facts: no
       roles:
@@ -68,7 +68,7 @@ partition space.
 * Create an ansible playbook, say `expandvar.yaml`:
     ```
     - hosts: mynodes
-      sudo: no
+      become: no
       remote_user: root
       gather_facts: no
       roles:

roles/openshift_storage_nfs_lvm/README.md

@@ -62,7 +62,7 @@ Both of them are mounted into `/exports/openshift` directory.  Both directories
 exported via NFS.  json files are created in /root.
 
     - hosts: nfsservers
-      sudo: no
+      become: no
       remote_user: root
       gather_facts: no
       roles:
@@ -87,7 +87,7 @@ exported via NFS.  json files are created in /root.
 * Create an ansible playbook, say `setupnfs.yaml`:
     ```
     - hosts: nfsservers
-      sudo: no
+      become: no
       remote_user: root
       gather_facts: no
       roles:

utils/src/ooinstall/openshift_ansible.py

@@ -121,7 +121,7 @@ def write_inventory_vars(base_inventory, multiple_masters, proxy):
     base_inventory.write('\n[OSEv3:vars]\n')
     base_inventory.write('ansible_ssh_user={}\n'.format(CFG.settings['ansible_ssh_user']))
     if CFG.settings['ansible_ssh_user'] != 'root':
-        base_inventory.write('ansible_become=true\n')
+        base_inventory.write('ansible_become=yes\n')
     if multiple_masters and proxy is not None:
         base_inventory.write('openshift_master_cluster_method=native\n')
         base_inventory.write("openshift_master_cluster_hostname={}\n".format(proxy.hostname))
@@ -169,7 +169,7 @@ def write_host(host, inventory, schedulable=None):
             if no_pwd_sudo == 1:
                 print 'The atomic-openshift-installer requires sudo access without a password.'
                 sys.exit(1)
-            facts += ' ansible_become=true'
+            facts += ' ansible_become=yes'
 
     inventory.write('{} {}\n'.format(host.connect_to, facts))