CORD-813
Use the genconfig/config.yml file for one-off runs of ansible
use port for ssh connections
Change-Id: If53b4e9cfa21d6da79b02069c7aa8077a8666aac
diff --git a/config/cord_in_a_box.yml b/config/cord_in_a_box.yml
index a2121ed..3743d3b 100644
--- a/config/cord_in_a_box.yml
+++ b/config/cord_in_a_box.yml
@@ -12,6 +12,7 @@
# provisioning
ansible_user: 'vagrant'
ansible_ssh_pass: 'vagrant'
+ ansible_ssh_port: 22
# Specifies tasks within the head node provisioning not to execute, including:
#
diff --git a/config/default.yml b/config/default.yml
index 33ceee9..e47182a 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -10,8 +10,9 @@
# User name and password used by Ansible to connect to the host for remote
# provisioning
- user: 'vagrant'
- password: 'vagrant'
+ ansible_user: 'vagrant'
+ ansible_ssh_pass: 'vagrant'
+ ansible_ssh_port: 22
# Specifies tasks within the head node provisioning not to execute, including:
#
diff --git a/config/onlab_develop_pod.yml b/config/onlab_develop_pod.yml
index bbe2b5e..ea05cc1 100644
--- a/config/onlab_develop_pod.yml
+++ b/config/onlab_develop_pod.yml
@@ -5,8 +5,10 @@
# User name and password used by Ansible to connect to the host for remote
# provisioning. These default values are used for automated testing, change
# with care.
- user: 'cord'
- password: 'cord'
+ ansible_user: 'cord'
+ ansible_ssh_pass: 'cord'
+ ansible_ssh_port: 22
+
# Network address information for the head node:
#
# fabric_ip - the IP address and mask bits to be used to configure the network
diff --git a/config/sample.yml b/config/sample.yml
index 5736385..d3a261a 100644
--- a/config/sample.yml
+++ b/config/sample.yml
@@ -4,14 +4,11 @@
# IP address of the head node
ip: '10.90.0.2'
- # If the head node is being accessed via a tunnel or reponds to SSH on a non-
- # standard port, the port value should be set.
- # port: '2022'
-
- # User name and password used by Ansible to connect to the host for remote
+ # User name, password, and ssh port used by Ansible to connect to the host for remote
# provisioning
- user: 'ubuntu'
- password: 'ubuntu'
+ ansible_user: 'ubuntu'
+ ansible_ssh_pass: 'ubuntu'
+ ansible_ssh_port: 22
# Network address information for the head node:
#