Skip to content

Commit 284d7a4

Browse files
committed
Fixes geerlingguy#230: Convert instances of ansible_ssh_user to ansible_user.
1 parent 95b557f commit 284d7a4

File tree

11 files changed

+11
-11
lines changed

11 files changed

+11
-11
lines changed

deployments-balancer/inventory

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ balancer
1010
app
1111

1212
[deployments:vars]
13-
ansible_ssh_user=vagrant
13+
ansible_user=vagrant
1414
ansible_ssh_private_key_file=~/.vagrant.d/insecure_private_key

deployments-rolling/inventory

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
192.168.3.5
66

77
[nodejs-api:vars]
8-
ansible_ssh_user=vagrant
8+
ansible_user=vagrant
99
ansible_ssh_private_key_file=~/.vagrant.d/insecure_private_key

deployments/playbooks/inventory-ansible

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
192.168.33.7
33

44
[rails:vars]
5-
ansible_ssh_user=vagrant
5+
ansible_user=vagrant
66
ansible_ssh_private_key_file=~/.vagrant.d/insecure_private_key

dynamic-inventory/custom/inventory.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function example_inventory() {
1717
'group' => [
1818
'hosts' => ['192.168.28.71', '192.168.28.72'],
1919
'vars' => [
20-
'ansible_ssh_user' => 'vagrant',
20+
'ansible_user' => 'vagrant',
2121
'ansible_ssh_private_key_file' => '~/.vagrant.d/insecure_private_key',
2222
'ansible_python_interpreter' => '/usr/bin/python3',
2323
'example_variable' => 'value',

dynamic-inventory/custom/inventory.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def example_inventory(self):
3838
'group': {
3939
'hosts': ['192.168.28.71', '192.168.28.72'],
4040
'vars': {
41-
'ansible_ssh_user': 'vagrant',
41+
'ansible_user': 'vagrant',
4242
'ansible_ssh_private_key_file':
4343
'~/.vagrant.d/insecure_private_key',
4444
'ansible_python_interpreter':

https-letsencrypt/inventory.example

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
subdomain.example.com
33

44
[letsencrypt:vars]
5-
ansible_ssh_user=myuser
5+
ansible_user=myuser
66

kubernetes/inventory

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ k8s-master
1010
k8s-nodes
1111

1212
[k8s:vars]
13-
ansible_ssh_user=vagrant
13+
ansible_user=vagrant
1414
ansible_ssh_private_key_file=~/.vagrant.d/insecure_private_key

lamp-infrastructure/Vagrantfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Vagrant.configure("2") do |config|
7171
ansible.inventory_path = "inventories/vagrant/inventory"
7272
ansible.limit = "all"
7373
ansible.extra_vars = {
74-
ansible_ssh_user: 'vagrant',
74+
ansible_user: 'vagrant',
7575
ansible_ssh_private_key_file: "~/.vagrant.d/insecure_private_key"
7676
}
7777
end

lamp-infrastructure/provisioners/aws.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
name: "{{ item.1.tagged_instances.0.public_ip }}"
9797
groups: "aws,{{ item.1.item.group }},{{ item.1.item.name }}"
9898
# You can dynamically add inventory variables per-host.
99-
ansible_ssh_user: ec2-user
99+
ansible_user: ec2-user
100100
host_key_checking: false
101101
mysql_replication_role: >
102102
{{ 'master' if (item.1.item.name == 'a4d.lamp.db.1')

lamp-infrastructure/provisioners/digitalocean.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
name: "{{ item.1.droplet.ip_address }}"
3434
groups: "do,{{ droplets[item.0].group }},{{ item.1.droplet.name }}"
3535
# You can dynamically add inventory variables per-host.
36-
ansible_ssh_user: root
36+
ansible_user: root
3737
mysql_replication_role: >
3838
"{{ 'master' if (item.1.droplet.name == 'a4d.lamp.db.1')
3939
else 'slave' }}"

orchestration/inventory

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ db
1414

1515
# Variables that will be applied to all servers
1616
[multi:vars]
17-
ansible_ssh_user=vagrant
17+
ansible_user=vagrant
1818
ansible_ssh_private_key_file=~/.vagrant.d/insecure_private_key
1919
ansible_ssh_common_args='-o StrictHostKeyChecking=no'

0 commit comments

Comments
 (0)