Merge "Removed ssh_ prefix from transports resources"

openstack-archive · Feb 1, 2016 · d9cb2c0 · d9cb2c0
2 parents 5b44dad + 3fa7dd8
commit d9cb2c0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/doc/source/faq.rst b/doc/source/faq.rst
@@ -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
 --------------------------------

diff --git a/solar/test/test_system_log_details.py b/solar/test/test_system_log_details.py
@@ -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
     ]
 
 

diff --git a/utils/jenkins/repository/nodes/1.0.0/nodes.yaml b/utils/jenkins/repository/nodes/1.0.0/nodes.yaml
@@ -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