From b0232506c5858656b80edd36d0ef05df0bfe0415 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Mon, 8 Jun 2015 19:10:15 -0400 Subject: [PATCH] removed deprecated user in favor of remote_user --- jboss-standalone/site.yml | 2 +- lamp_haproxy/rolling_update.yml | 2 +- lamp_haproxy/site.yml | 10 +++++----- language_features/ansible_pull.yml | 2 +- language_features/conditionals_part1.yml | 2 +- language_features/conditionals_part2.yml | 2 +- language_features/environment.yml | 2 +- language_features/eucalyptus-ec2.yml | 4 ++-- language_features/file_secontext.yml | 2 +- language_features/group_commands.yml | 2 +- language_features/intermediate_example.yml | 2 +- language_features/intro_example.yml | 4 ++-- language_features/loop_with_items.yml | 2 +- language_features/mysql.yml | 2 +- language_features/nested_playbooks.yml | 2 +- language_features/prompts.yml | 2 +- language_features/register_logic.yml | 2 +- language_features/tags.yml | 4 ++-- language_features/user_commands.yml | 2 +- mongodb/playbooks/testsharding.yml | 2 +- tomcat-standalone/site.yml | 2 +- wordpress-nginx/site.yml | 2 +- 22 files changed, 29 insertions(+), 29 deletions(-) diff --git a/jboss-standalone/site.yml b/jboss-standalone/site.yml index 515bb3e..d932a78 100644 --- a/jboss-standalone/site.yml +++ b/jboss-standalone/site.yml @@ -2,7 +2,7 @@ # This playbook deploys a simple standalone JBoss server. - hosts: jboss-servers - user: root + remote_user: root roles: - jboss-standalone diff --git a/lamp_haproxy/rolling_update.yml b/lamp_haproxy/rolling_update.yml index abd3d1a..7a52154 100644 --- a/lamp_haproxy/rolling_update.yml +++ b/lamp_haproxy/rolling_update.yml @@ -12,7 +12,7 @@ tasks: [] - hosts: webservers - user: root + remote_user: root serial: 1 # These are the tasks to run before applying updates: diff --git a/lamp_haproxy/site.yml b/lamp_haproxy/site.yml index f6ea45b..33f829b 100644 --- a/lamp_haproxy/site.yml +++ b/lamp_haproxy/site.yml @@ -3,13 +3,13 @@ # Apply common configuration to all hosts - hosts: all - user: root + remote_user: root roles: - common # Configure and deploy database servers. - hosts: dbservers - user: root + remote_user: root roles: - db @@ -17,20 +17,20 @@ # the 'base-apache' role which simply sets up Apache, and 'web' which includes # our example web application. - hosts: webservers - user: root + remote_user: root roles: - base-apache - web # Configure and deploy the load balancer(s). - hosts: lbservers - user: root + remote_user: root roles: - haproxy # Configure and deploy the Nagios monitoring node(s). - hosts: monitoring - user: root + remote_user: root roles: - base-apache - nagios diff --git a/language_features/ansible_pull.yml b/language_features/ansible_pull.yml index da13a88..cba67d1 100644 --- a/language_features/ansible_pull.yml +++ b/language_features/ansible_pull.yml @@ -16,7 +16,7 @@ --- - hosts: pull_mode_hosts - user: root + remote_user: root vars: diff --git a/language_features/conditionals_part1.yml b/language_features/conditionals_part1.yml index 137596e..6c8c920 100644 --- a/language_features/conditionals_part1.yml +++ b/language_features/conditionals_part1.yml @@ -14,7 +14,7 @@ # as root - hosts: all - user: root + remote_user: root # we have a common list of variables stored in /vars/external_vars.yml # that we will always import diff --git a/language_features/conditionals_part2.yml b/language_features/conditionals_part2.yml index b070790..abed3f0 100644 --- a/language_features/conditionals_part2.yml +++ b/language_features/conditionals_part2.yml @@ -3,7 +3,7 @@ # certain tasks on machines/platforms/etc where they do not apply. - hosts: all - user: root + remote_user: root vars: favcolor: "red" diff --git a/language_features/environment.yml b/language_features/environment.yml index 10d5ddb..16ffce9 100644 --- a/language_features/environment.yml +++ b/language_features/environment.yml @@ -8,7 +8,7 @@ - hosts: all - user: root + remote_user: root # here we make a variable named "env" that is a dictionary vars: diff --git a/language_features/eucalyptus-ec2.yml b/language_features/eucalyptus-ec2.yml index 1d38dbb..38b7e6f 100644 --- a/language_features/eucalyptus-ec2.yml +++ b/language_features/eucalyptus-ec2.yml @@ -14,7 +14,7 @@ - name: Stage instance(s) hosts: local connection: local - user: root + remote_user: root gather_facts: false vars: @@ -53,7 +53,7 @@ # This play targets the new host group - name: Configure instance hosts: deploy - user: root + remote_user: root # Do some stuff on each instance .... diff --git a/language_features/file_secontext.yml b/language_features/file_secontext.yml index f87f94b..c12c1fd 100644 --- a/language_features/file_secontext.yml +++ b/language_features/file_secontext.yml @@ -1,7 +1,7 @@ --- # This is a demo of how to manage the selinux context using the file module - hosts: test - user: root + remote_user: root tasks: - name: Change setype of /etc/exports to non-default value file: path=/etc/exports setype=etc_t diff --git a/language_features/group_commands.yml b/language_features/group_commands.yml index 00ba531..93505bc 100644 --- a/language_features/group_commands.yml +++ b/language_features/group_commands.yml @@ -2,7 +2,7 @@ # This is a demo of how the group command works. - hosts: all - user: root + remote_user: root sudo: yes tasks: diff --git a/language_features/intermediate_example.yml b/language_features/intermediate_example.yml index 08c3657..5ab4ac2 100644 --- a/language_features/intermediate_example.yml +++ b/language_features/intermediate_example.yml @@ -67,7 +67,7 @@ # if you want. sudo support is coming too. - hosts: webservers - user: mdehaan + remote_user: mdehaan # vars must be specified again for the next play in the playbook # but can be reused by including from vars_files if you want diff --git a/language_features/intro_example.yml b/language_features/intro_example.yml index 9b96039..dd3b6a3 100644 --- a/language_features/intro_example.yml +++ b/language_features/intro_example.yml @@ -9,10 +9,10 @@ - name: example play hosts: all - user: root + remote_user: root # could have also have done: -# user: mdehaan +# remote_user: mdehaan # sudo: yes # make these variables available inside of templates diff --git a/language_features/loop_with_items.yml b/language_features/loop_with_items.yml index b55a6c8..ee21915 100644 --- a/language_features/loop_with_items.yml +++ b/language_features/loop_with_items.yml @@ -4,7 +4,7 @@ # multiple users - hosts: all - user: root + remote_user: root tasks: diff --git a/language_features/mysql.yml b/language_features/mysql.yml index 1891cc8..912b840 100644 --- a/language_features/mysql.yml +++ b/language_features/mysql.yml @@ -4,7 +4,7 @@ --- - hosts: all - user: root + remote_user: root tasks: diff --git a/language_features/nested_playbooks.yml b/language_features/nested_playbooks.yml index 7c1f2af..46e44a4 100644 --- a/language_features/nested_playbooks.yml +++ b/language_features/nested_playbooks.yml @@ -10,7 +10,7 @@ - name: this is a play at the top level of a file hosts: all - user: root + remote_user: root tasks: - name: say hi tags: foo diff --git a/language_features/prompts.yml b/language_features/prompts.yml index dc033f0..528d50c 100644 --- a/language_features/prompts.yml +++ b/language_features/prompts.yml @@ -4,7 +4,7 @@ # of a playbook run, for example, as part of a release script. - hosts: all - user: root + remote_user: root # regular variables are a dictionary of keys and values diff --git a/language_features/register_logic.yml b/language_features/register_logic.yml index 083ad84..dcfe8a8 100644 --- a/language_features/register_logic.yml +++ b/language_features/register_logic.yml @@ -4,7 +4,7 @@ # easy to do, and here we'll show you how. - name: test playbook - user: root + remote_user: root hosts: all tasks: diff --git a/language_features/tags.yml b/language_features/tags.yml index 19cfb5c..5bba1fe 100644 --- a/language_features/tags.yml +++ b/language_features/tags.yml @@ -13,7 +13,7 @@ - name: example play one hosts: all - user: root + remote_user: root # any tags applied to the play are shorthand to applying # the tag to all tasks in it. Here, each task is given @@ -33,7 +33,7 @@ - name: example play two hosts: all - user: root + remote_user: root tasks: - name: hi tags: diff --git a/language_features/user_commands.yml b/language_features/user_commands.yml index 7be7be2..a2f4967 100644 --- a/language_features/user_commands.yml +++ b/language_features/user_commands.yml @@ -3,7 +3,7 @@ # in vars sections. You could also use vars_files if you like (see other examples) - hosts: all - user: root + remote_user: root vars: # created with: # python -c 'import crypt; print crypt.crypt("This is my Password", "$1$SomeSalt$")' diff --git a/mongodb/playbooks/testsharding.yml b/mongodb/playbooks/testsharding.yml index 24c7849..71ce9f5 100644 --- a/mongodb/playbooks/testsharding.yml +++ b/mongodb/playbooks/testsharding.yml @@ -2,7 +2,7 @@ # The playbook creates a new database test and populates data in the database to test the sharding. - hosts: $servername - user: root + remote_user: root tasks: - name: Create a new database and user mongodb_user: login_user=admin login_password=${mongo_admin_pass} login_port=${mongos_port} database=test user=admin password=${mongo_admin_pass} state=present diff --git a/tomcat-standalone/site.yml b/tomcat-standalone/site.yml index a67dde3..9236d1e 100644 --- a/tomcat-standalone/site.yml +++ b/tomcat-standalone/site.yml @@ -2,7 +2,7 @@ # This playbook deploys a simple standalone Tomcat 7 server. - hosts: tomcat-servers - user: root + remote_user: root roles: - selinux diff --git a/wordpress-nginx/site.yml b/wordpress-nginx/site.yml index 59e3867..80dd10a 100644 --- a/wordpress-nginx/site.yml +++ b/wordpress-nginx/site.yml @@ -1,7 +1,7 @@ --- - name: Install WordPress, MySQL, Nginx, and PHP-FPM hosts: wordpress-server - user: root + remote_user: root # remote_user: user # sudo: yes