From d003bfe1dfe04585c8c471aecbe126f31107b6c0 Mon Sep 17 00:00:00 2001
From: Julien Vey <julien.vey@numergy.com>
Date: Wed, 20 Aug 2014 17:50:11 +0200
Subject: [PATCH] Add functional tests for public_key_path

---
 .travis.yml                         |  2 ++
 source/functional_tests/Vagrantfile | 13 +++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 36edcd4..03b4f8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ rvm:
 - 2.1.0
 before_install:
 - cd source
+- ssh-keygen -P "" -f functional_tests/for_vagrant_test
 install:
 - travis_retry bundle install
 - travis_retry appraisal install
@@ -26,4 +27,5 @@ env:
   - OS_FLOATING_IP_POOL: PublicNetwork-01
   - OS_USERNAME: vagrant-openstack@numergy.com
   - OS_TENANT_NAME: Numergy-Dev:vagrant-openstack-plugin-test
+  - OS_PUBLIC_KEY_PATH: for_vagrant_test.pub
   - secure: Ddlq2qIMjZAgvmzJIcEmcUbPJGQI/RHReV5EqrliS/tyUTOkYhdGNVoiss8OB+zGneyshltVwFaa+NsLj5+nr6AlqLG5oiHmQfNd5XgiSr/uOOIxZ2EgyRfXKQFu+ABBcxpYHCl0/tmeETVhv0c8k5at7QHP4VOEfkRM88J7DJE=
diff --git a/source/functional_tests/Vagrantfile b/source/functional_tests/Vagrantfile
index 57fe6de..34a51e5 100644
--- a/source/functional_tests/Vagrantfile
+++ b/source/functional_tests/Vagrantfile
@@ -16,7 +16,6 @@ Vagrant.configure("2") do |config|
     os.openstack_compute_url  = ENV['OS_COMPUTE_URL']
     os.openstack_network_url  = ENV['OS_NETWORK_URL']
     os.tenant_name            = ENV['OS_TENANT_NAME']
-    os.keypair_name           = ENV['OS_KEYPAIR_NAME']
     os.ssh_timeout            = ENV['OS_SSH_TIMEOUT'].to_i
     os.sync_method            = ENV['OS_SYNC_METHOD']
     os.flavor                 = ENV['OS_FLAVOR']
@@ -26,13 +25,23 @@ Vagrant.configure("2") do |config|
 
   config.vm.define 'test-basic' do |test|
     test.vm.provider :openstack do |os|
-      os.floating_ip = ENV['OS_FLOATING_IP']
+      os.keypair_name = ENV['OS_KEYPAIR_NAME']
+      os.floating_ip  = ENV['OS_FLOATING_IP']
     end
     test.vm.provision 'shell', inline: 'echo "SUCCESS" > /tmp/test_shell_provision'
   end
 
   config.vm.define 'test-floating-ip-pool' do |test|
     test.vm.provider :openstack do |os|
+      os.keypair_name     = ENV['OS_KEYPAIR_NAME']
+      os.floating_ip_pool = ENV['OS_FLOATING_IP_POOL']
+    end
+    test.vm.provision 'shell', inline: 'echo "SUCCESS" > /tmp/test_shell_provision'
+  end
+
+  config.vm.define 'test-ssh-public-key-path' do |test|
+    test.vm.provider :openstack do |os|
+      os.public_key_path  = ENV['OS_PUBLIC_KEY_PATH']
       os.floating_ip_pool = ENV['OS_FLOATING_IP_POOL']
     end
     test.vm.provision 'shell', inline: 'echo "SUCCESS" > /tmp/test_shell_provision'