Skip to content

Commit

Permalink
ran ansible-lint: stripped trailing spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
bbaassssiiee committed Apr 8, 2016
1 parent 934dd82 commit 036c3b8
Show file tree
Hide file tree
Showing 45 changed files with 86 additions and 86 deletions.
2 changes: 1 addition & 1 deletion jboss-standalone/roles/jboss-standalone/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
- name: restart jboss
- name: restart jboss
service: name=jboss state=restarted

- name: restart iptables
Expand Down
2 changes: 1 addition & 1 deletion jboss-standalone/roles/jboss-standalone/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
copy: src=jboss-as-standalone.sh dest=/etc/init.d/jboss mode=0755

- name: Enable JBoss to be started at boot
service: name=jboss enabled=yes state=started
service: name=jboss enabled=yes state=started

- name: deploy iptables rules
template: src=iptables-save dest=/etc/sysconfig/iptables
Expand Down
4 changes: 2 additions & 2 deletions jboss-standalone/site.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
# This playbook deploys a simple standalone JBoss server.
# This playbook deploys a simple standalone JBoss server.

- hosts: jboss-servers
- hosts: jboss-servers
remote_user: root

roles:
Expand Down
4 changes: 2 additions & 2 deletions lamp_haproxy/roles/common/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
- name: Create the GPG key for EPEL
copy: src=RPM-GPG-KEY-EPEL-6 dest=/etc/pki/rpm-gpg

- name: install some useful nagios plugins
- name: install some useful nagios plugins
yum: name={{ item }} state=present
with_items:
- nagios-nrpe
Expand All @@ -23,7 +23,7 @@
- nagios-plugins-load
- nagios-plugins-disk

- name: Install ntp
- name: Install ntp
yum: name=ntp state=present
tags: ntp

Expand Down
2 changes: 1 addition & 1 deletion lamp_haproxy/roles/db/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

- name: Create Mysql configuration file
template: src=my.cnf.j2 dest=/etc/my.cnf
notify:
notify:
- restart mysql

- name: Start Mysql Service
Expand Down
2 changes: 1 addition & 1 deletion lamp_haproxy/roles/nagios/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
# handlers for nagios
# handlers for nagios
- name: restart httpd
service: name=httpd state=restarted

Expand Down
2 changes: 1 addition & 1 deletion lamp_haproxy/roles/nagios/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
# This will install nagios

- name: install nagios
- name: install nagios
yum: pkg={{ item }} state=present
with_items:
- nagios
Expand Down
2 changes: 1 addition & 1 deletion lamp_haproxy/roles/web/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---

# httpd is handled by the base-apache role upstream
- name: Install php and git
- name: Install php and git
yum: name={{ item }} state=present
with_items:
- php
Expand Down
4 changes: 2 additions & 2 deletions lamp_haproxy/site.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
# This playbook deploys the whole application stack in this site.
# This playbook deploys the whole application stack in this site.

# Apply common configuration to all hosts
- hosts: all
Expand All @@ -13,7 +13,7 @@
roles:
- db

# Configure and deploy the web servers. Note that we include two roles here,
# Configure and deploy the web servers. Note that we include two roles here,
# the 'base-apache' role which simply sets up Apache, and 'web' which includes
# our example web application.
- hosts: webservers
Expand Down
2 changes: 1 addition & 1 deletion lamp_simple/roles/common/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
# This playbook contains common plays that will be run on all nodes.

- name: Install ntp
- name: Install ntp
yum: name=ntp state=present
tags: ntp

Expand Down
2 changes: 1 addition & 1 deletion lamp_simple/roles/db/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

- name: Create Mysql configuration file
template: src=my.cnf.j2 dest=/etc/my.cnf
notify:
notify:
- restart mysql

- name: Start Mysql Service
Expand Down
4 changes: 2 additions & 2 deletions lamp_simple/roles/web/tasks/copy_code.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
# These tasks are responsible for copying the latest dev/production code from
# the version control system.
# the version control system.

- name: Copy the code from repository
git: repo={{ repository }} dest=/var/www/html/

- name: Creates the index.php file
- name: Creates the index.php file
template: src=index.php.j2 dest=/var/www/html/index.php
2 changes: 1 addition & 1 deletion lamp_simple/roles/web/tasks/install_httpd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
service: name=httpd state=started enabled=yes

- name: Configure SELinux to allow httpd to connect to remote database
seboolean: name=httpd_can_network_connect_db state=true persistent=yes
seboolean: name=httpd_can_network_connect_db state=true persistent=yes
when: sestatus.rc != 0
2 changes: 1 addition & 1 deletion lamp_simple/site.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
# This playbook deploys the whole application stack in this site.
# This playbook deploys the whole application stack in this site.

- name: apply common configuration to all nodes
hosts: all
Expand Down
2 changes: 1 addition & 1 deletion lamp_simple_rhel7/roles/common/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
# This playbook contains common plays that will be run on all nodes.

- name: Install ntp
- name: Install ntp
yum: name=ntp state=present
tags: ntp

Expand Down
6 changes: 3 additions & 3 deletions lamp_simple_rhel7/roles/db/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@

- name: Create Mysql configuration file
template: src=my.cnf.j2 dest=/etc/my.cnf
notify:
notify:
- restart mariadb

- name: Create MariaDB log file
file: path=/var/log/mysqld.log state=touch owner=mysql group=mysql mode=0775

- name: Create MariaDB PID directory
file: path=/var/run/mysqld state=directory owner=mysql group=mysql mode=0775

Expand Down
4 changes: 2 additions & 2 deletions lamp_simple_rhel7/roles/web/tasks/copy_code.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
# These tasks are responsible for copying the latest dev/production code from
# the version control system.
# the version control system.

- name: Copy the code from repository
git: repo={{ repository }} dest=/var/www/html/

- name: Creates the index.php file
- name: Creates the index.php file
template: src=index.php.j2 dest=/var/www/html/index.php
2 changes: 1 addition & 1 deletion lamp_simple_rhel7/site.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
# This playbook deploys the whole application stack in this site.
# This playbook deploys the whole application stack in this site.

- name: apply common configuration to all nodes
hosts: all
Expand Down
4 changes: 2 additions & 2 deletions language_features/conditionals_part2.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# this is a demo of conditional executions using 'when' statements, which can skip
# certain tasks on machines/platforms/etc where they do not apply.
# certain tasks on machines/platforms/etc where they do not apply.

- hosts: all
remote_user: root
Expand Down Expand Up @@ -28,7 +28,7 @@
- name: "do this if I have one of these SSNs"
shell: /bin/true
when: ssn in [ 8675309, 8675310, 8675311 ]

- name: "do this if a variable named hippo is NOT defined"
shell: /bin/true
when: hippo is not defined
Expand Down
12 changes: 6 additions & 6 deletions language_features/delegation.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---

# this is an example of how we can perform actions on a given host on behalf of all the hosts
# in a play.
# in a play.
#
# The two main uses of this would be signalling an outage window for hosts that
# we are going to start upgrading, or to take a machine out of rotation by talking to a load
# balancer.
# balancer.
#
# This example cheats by replacing the load balancer script with the 'echo' command,
# leaving actual communication with the load balancer as an exercise to the reader. In reality,
# you could call anything you want, the main thing is that it should do something with
# you could call anything you want, the main thing is that it should do something with
# {{inventory_hostname}}

# NOTE: see batch_size_control.yml for an example of the 'serial' keyword, which you almost certainly
Expand All @@ -20,19 +20,19 @@
serial: 5

tasks:

- name: take the machine out of rotation
command: echo taking out of rotation {{inventory_hostname}}
delegate_to: 127.0.0.1

# here's an alternate notation if you are delegating to 127.0.0.1, you can use 'local_action'
# here's an alternate notation if you are delegating to 127.0.0.1, you can use 'local_action'
# instead of 'action' and leave off the 'delegate_to' part.
#
# - local_action: command echo taking out of rotation {{inventory_hostname}}

- name: do several things on the actual host
command: echo hi mom {{inventory_hostname}}

- name: put machine back into rotation
command: echo inserting into rotation {{inventory_hostname}}
delegate_to: 127.0.0.1
Expand Down
4 changes: 2 additions & 2 deletions language_features/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

# here we make a variable named "env" that is a dictionary
vars:
env:
env:
HI: test2
http_proxy: http://proxy.example.com:8080

Expand All @@ -26,7 +26,7 @@
HI: test1

# here we are using the $env variable above

- shell: echo $HI
environment: env

Expand Down
12 changes: 6 additions & 6 deletions language_features/eucalyptus-ec2.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
# This playbook is an example for deploying multiple instances into
# EC2/Euca and "doing something" with them.
#
#
# - uses the ec2 and ec2_vol module.
#
# Run this with ansible-playbook and supply the private key for your
# EC2/Euca user (to access the instance in the second play), e.g:
#
#
# ansible-playbook eucalyptus-ec2-deploy.yml -v --private-key=/path/to/ec2/pri/key
#

Expand All @@ -26,12 +26,12 @@
# Launch 5 instances with the following parameters. Register the output.

tasks:
- name: Launch instance
- name: Launch instance
ec2: keypair={{keypair}} group={{security_group}}
instance_type={{instance_type}} image={{image}}
wait=true count=5
wait=true count=5
register: ec2

# Use with_items to add each instances public IP to a new hostgroup for use in the next play.

- name: Add new instances to host group
Expand Down Expand Up @@ -60,6 +60,6 @@
tasks:
- name: Ensure NTP is up and running
service: name=ntpd state=started

- name: Install Apache Web Server
yum: pkg=httpd state=latest
2 changes: 1 addition & 1 deletion language_features/group_by.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
- hosts: CentOS-6.3

tasks:

- name: ping all CentOS 6.3 hosts
ping:

Expand Down
2 changes: 1 addition & 1 deletion language_features/loop_plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
- file: dest=/etc/fooapp state=directory

- copy: src={{ item }} dest=/etc/fooapp/ owner=root mode=600
with_fileglob: /playbooks/files/fooapp/*
with_fileglob: /playbooks/files/fooapp/*


6 changes: 3 additions & 3 deletions language_features/prompts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@
prompt: "Product release version"
default: "my_default_version"
private: no

- name: "my_password2"
prompt: "Enter password2"
private: yes
encrypt: "md5_crypt"
encrypt: "md5_crypt"
confirm: yes
salt_size: 7
salt: "foo"
salt: "foo"

# this is just a simple example to show that vars_prompt works, but
# you might ask for a tag to use with the git module or perhaps
Expand Down
12 changes: 6 additions & 6 deletions language_features/register_logic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
tasks:

# it is possible to save the result of any command in a named register. This variable will be made
# available to tasks and templates made further down in the execution flow.
# available to tasks and templates made further down in the execution flow.

- shell: grep hi /etc/motd
ignore_errors: yes
register: motd_result

# and here we access the register. Note that variable is structured data because
# it is a return from the command module. The shell module makes available variables such as
# as 'stdout', 'stderr', and 'rc'.
# as 'stdout', 'stderr', and 'rc'.

# here we run the next action only if the previous grep returned true

Expand All @@ -29,17 +29,17 @@

- shell: echo "motd contains the word hi"
when: motd_result.stdout.find('hi') != -1

# or also:

- shell: echo "motd contains word hi"
when: "'hi' in motd_result.stdout"

# you can use 'stdout_lines' to loop over the registered output lines
- name: motd lines matching 'hi'
shell: echo "{{ item }}"
with_items: motd_result.stdout_lines

# you can also split 'stdout' yourself
- name: motd lines matching 'hi'
shell: echo "{{ item }}"
Expand Down
6 changes: 3 additions & 3 deletions language_features/roletest.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# in Ansible 1.2 and later, roles allow easy best-practices organization of content
# in Ansible 1.2 and later, roles allow easy best-practices organization of content
# and maximize shareability of ansible building blocks.
#
# suppose a playbook applied to a group of hosts includes two roles, foo and bar.
Expand All @@ -18,7 +18,7 @@
#
# templates and copy operations also get smarter about where to look for content when using
# roles.
#
#
# as an example, a task in foo/tasks/main.yml could copy or template a file by
# referencing a "src=foo.j2" rather than having to explicitly path src=roles/foo/templates/foo.j2.

Expand All @@ -35,7 +35,7 @@

roles:

# a role can be listed flat like this:
# a role can be listed flat like this:
#
# - common
# - webservers
Expand Down
Loading

0 comments on commit 036c3b8

Please sign in to comment.