From 99f1ca409b8246fd58a1857b4f47aa739a1f97d6 Mon Sep 17 00:00:00 2001
From: Julia Kreger <juliaashleykreger@gmail.com>
Date: Fri, 30 Sep 2016 12:28:37 +0000
Subject: [PATCH] Add keystone install and clouds.yaml to testing

In order for syntax checking to occur, we need to add the
new roles to the test playbook and variables to the test
script to enable future test jobs to be created.

Change-Id: I6728c0a860b6dd9d4abf2c1ba699d1f444e1d22d
---
 playbooks/test-bifrost.yaml | 2 ++
 scripts/test-bifrost.sh     | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/playbooks/test-bifrost.yaml b/playbooks/test-bifrost.yaml
index a91348270..c35e6865f 100644
--- a/playbooks/test-bifrost.yaml
+++ b/playbooks/test-bifrost.yaml
@@ -67,6 +67,7 @@
       shell: netstat -apn|grep LISTEN
       when: ci_testing is defined
   roles:
+    - role: bifrost-keystone-install
     - role: bifrost-ironic-install
       cleaning: false
       testing: true
@@ -75,6 +76,7 @@
     # the ramdisk which causes ramdisk-image-create to believe it failed.
     - { role: bifrost-create-dib-image, dib_imagename: "{{ http_boot_folder }}/ipa", build_ramdisk: false, dib_os_element: "{{ ipa_dib_os_element|default('debian') }}", dib_os_release: "jessie", dib_elements: "ironic-agent {{ ipa_extra_dib_elements | default('') }}", when: create_ipa_image | bool == true }
     - { role: bifrost-create-dib-image, dib_imagetype: "qcow2", dib_imagename: "{{deploy_image}}", dib_os_element: "debian", dib_os_release: "jessie", dib_elements: "vm serial-console simple-init {{ extra_dib_elements|default('') }}", when: create_image_via_dib | bool == true and transform_boot_image | bool == false }
+    - { role: bifrost-keystone-client-config, config_username: "{{ ironic.keystone.default_username }}", config_password: "{{ ironic.keystone.default_password }}", config_project_name: "baremetal", config_region_name: "{{ keystone.bootstrap.region_name }}", config_auth_url: "{{ keystone.bootstrap.public_url }}", user: "{{ ansible_env.SUDO_USER }}", when: enable_keystone is defined and enable_keystone | bool == true }
   environment:
     http_proxy: "{{ lookup('env','http_proxy') }}"
     https_proxy: "{{ lookup('env','https_proxy') }}"
diff --git a/scripts/test-bifrost.sh b/scripts/test-bifrost.sh
index d01a8f8ab..81957af89 100755
--- a/scripts/test-bifrost.sh
+++ b/scripts/test-bifrost.sh
@@ -36,6 +36,8 @@ DOWNLOAD_IPA=true
 CREATE_IPA_IMAGE=false
 WRITE_INTERFACES_FILE=true
 PROVISION_WAIT_TIMEOUT=${PROVISION_WAIT_TIMEOUT:-900}
+NOAUTH_MODE=true
+ENABLE_KEYSTONE=false
 
 # NOTE(cinerama): We could remove this if we change the CI job to use
 # USE_DHCP, BUILD_IMAGE, etc.
@@ -137,7 +139,9 @@ ${ANSIBLE} -vvvv \
     -e download_ipa=${DOWNLOAD_IPA} \
     -e create_ipa_image=${CREATE_IPA_IMAGE} \
     -e write_interfaces_file=${WRITE_INTERFACES_FILE} \
-    -e wait_timeout=${PROVISION_WAIT_TIMEOUT}
+    -e wait_timeout=${PROVISION_WAIT_TIMEOUT} \
+    -e noauth_mode=${NOAUTH_MODE} \
+    -e enable_keystone=${ENABLE_KEYSTONE}
 EXITCODE=$?
 
 if [ $EXITCODE != 0 ]; then