From 9d423e6144b495d51a71335ff86740e249dcc95e Mon Sep 17 00:00:00 2001
From: Kevin Carter <kevin.carter@rackspace.com>
Date: Thu, 10 Dec 2015 11:37:39 -0600
Subject: [PATCH] updated repo pathing for new org

Change-Id: I6ea4732625233c1940c07535314dddbc59f2aaf0
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
---
 .gitreview                          |  5 +++++
 tests/ansible-role-requirements.yml |  2 +-
 tests/ansible.cfg                   |  4 ++++
 tests/test.yml                      | 34 ++++++++++++++++++++++++-----
 4 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 .gitreview

diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..0b99ade
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=review.openstack.org
+port=29418
+project=openstack/openstack-ansible-repo_server.git
+
diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml
index 314031c..263784b 100644
--- a/tests/ansible-role-requirements.yml
+++ b/tests/ansible-role-requirements.yml
@@ -19,6 +19,6 @@
   scm: git
   version: master
 - name: memcached_server
-  src: https://github.com/os-cloud/openstack-ansible-memcached_server
+  src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
   scm: git
   version: master
diff --git a/tests/ansible.cfg b/tests/ansible.cfg
index 5c1deec..a30e8b5 100644
--- a/tests/ansible.cfg
+++ b/tests/ansible.cfg
@@ -1,4 +1,8 @@
 [defaults]
 roles_path = ../../
 remote_tmp = ../.ansible/tmp/
+
 host_key_checking = False
+
+[ssh_connection]
+control_path = /tmp/%%h-%%r
diff --git a/tests/test.yml b/tests/test.yml
index 28e837a..8369e36 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -13,13 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Playbook for pre-role testing 1of2
-  hosts: localhost
+- name: Playbook for pre-role testing 1of3
+  hosts: 127.0.0.1
   connection: local
+  become: false
   pre_tasks:
-    - name: Ensure root ssh key
+    - name: Create ssh key pair for root
       user:
-        name: "{{ ansible_env.USER | default('root') }}"
+        name: "{{ ansible_ssh_user }}"
         generate_ssh_key: "yes"
         ssh_key_bits: 2048
         ssh_key_file: ".ssh/id_rsa"
@@ -28,6 +29,18 @@
       register: key_get
     - set_fact:
         lxc_container_ssh_key: "{{ key_get.stdout }}"
+
+- name: Playbook for pre-role testing 2of3
+  hosts: localhost
+  connection: local
+  pre_tasks:
+    - name: Ensure root's new public ssh key is in authorized_keys
+      authorized_key:
+        user: root
+        key: "{{ hostvars['127.0.0.1']['lxc_container_ssh_key'] }}"
+        manage_dir: no
+    - set_fact:
+        lxc_container_ssh_key: "{{ hostvars['127.0.0.1']['lxc_container_ssh_key'] }}"
   roles:
     - role: "lxc_hosts"
       lxc_net_address: 10.100.100.1
@@ -90,15 +103,26 @@
       lxc_container_backing_store: dir
       global_environment_variables:
         PATH: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+  post_tasks:
+    - name: Wait for ssh to be available
+      local_action:
+        module: wait_for
+        port: "{{ ansible_ssh_port | default('22') }}"
+        host: "{{ ansible_ssh_host | default(inventory_hostname) }}"
+        search_regex: OpenSSH
+        delay: 1
 
 - name: Playbook for role testing
   hosts: repo_all
+  user: root
   gather_facts: true
   roles:
     - role: "{{ rolename | basename }}"
   post_tasks:
     - name: Confirm containers were created
       command: curl -D - 10.100.100.101:8181
+      tags:
+        - skip_ansible_lint
     - name: Check nginx is running
       shell: "ps auxf | grep nginx"
       delegate_to: 10.100.100.101
@@ -125,4 +149,4 @@
         that:
           - "repo_dir1.stat.exists"
           - "repo_dir2.stat.exists"
-          - "repo_dir3.stat.exists"
\ No newline at end of file
+          - "repo_dir3.stat.exists"