Removed ssh_ prefix from transports resources
Change-Id: I1afde3a91766c0abf0f99fcfd401a7b97a730b9f Closes-bug: 1537093
This commit is contained in:
parent
d7ca2108d3
commit
3fa7dd8afa
@ -17,7 +17,7 @@ I want to use different SSH keys
|
||||
|
||||
Just update resource for example::
|
||||
|
||||
solar resource update ssh_transport1 '{"ssh_key": "/path/to/some/key"}'
|
||||
solar resource update ssh_transport1 '{"key": "/path/to/some/key"}'
|
||||
|
||||
I want to use passwords not keys
|
||||
--------------------------------
|
||||
|
@ -24,8 +24,8 @@ def host_diff():
|
||||
[u'ip', u'10.0.0.3'],
|
||||
[u'hosts_names', ['riak_server1.solar', 'riak_server2.solar',
|
||||
'riak_server3.solar']],
|
||||
[u'ssh_user', u'vagrant'],
|
||||
[u'ssh_key',
|
||||
[u'user', u'vagrant'],
|
||||
[u'key',
|
||||
u'/vagrant/.vagrant/machines/solar-dev1/virtualbox/private_key'],
|
||||
]]
|
||||
]
|
||||
@ -35,8 +35,8 @@ def test_details_for_add(host_diff):
|
||||
assert data.details(host_diff) == [
|
||||
'++ ip: 10.0.0.3',
|
||||
"++ hosts_names: ['riak_server1.solar', 'riak_server2.solar', 'riak_server3.solar']", # NOQA
|
||||
'++ ssh_user: vagrant',
|
||||
'++ ssh_key: /vagrant/.vagrant/machines/solar-dev1/virtualbox/private_key' # NOQA
|
||||
'++ user: vagrant',
|
||||
'++ key: /vagrant/.vagrant/machines/solar-dev1/virtualbox/private_key' # NOQA
|
||||
]
|
||||
|
||||
|
||||
|
@ -5,8 +5,8 @@ resources:
|
||||
- id: ssh_transport#{j}#
|
||||
from: resources/transport_ssh
|
||||
input:
|
||||
ssh_user: 'vagrant'
|
||||
ssh_password: 'vagrant'
|
||||
user: 'vagrant'
|
||||
password: 'vagrant'
|
||||
- id: rsync#{j}#
|
||||
from: resources/transport_rsync
|
||||
input:
|
||||
@ -16,9 +16,9 @@ resources:
|
||||
from: resources/transports
|
||||
input:
|
||||
transports:
|
||||
- password: ssh_transport#{j}#::ssh_password
|
||||
user: ssh_transport#{j}#::ssh_user
|
||||
port: ssh_transport#{j}#::ssh_port
|
||||
- password: ssh_transport#{j}#::password
|
||||
user: ssh_transport#{j}#::user
|
||||
port: ssh_transport#{j}#::port
|
||||
name: ssh_transport#{j}#::name
|
||||
- password: rsync#{j}#::password
|
||||
name: rsync#{j}#::name
|
||||
|
Loading…
x
Reference in New Issue
Block a user