From 2d65892f2b36b3ad88c52fefe6fd896abb9cc75c Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Wed, 4 Sep 2013 18:00:06 -0700 Subject: [PATCH] update hiera writes the hiera data has been moved to the data directory. This commit updates the test script. --- data/config.yaml | 1 + tests/basic_test.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/data/config.yaml b/data/config.yaml index ed83a83..e4969fa 100644 --- a/data/config.yaml +++ b/data/config.yaml @@ -14,3 +14,4 @@ verbose: # select one node_group to determine the nodes available for provisioning # node_group: multi_node # node_group: swift +operatingsystem: ubuntu diff --git a/tests/basic_test.sh b/tests/basic_test.sh index 18c4743..163a330 100755 --- a/tests/basic_test.sh +++ b/tests/basic_test.sh @@ -69,20 +69,20 @@ fi # set up jenkins specific data overrides if [ -n "${openstack_package_repo:-}" ]; then if [ $openstack_package_repo = 'cisco_repo' ]; then - echo 'package_repo: cisco_repo' >> hiera_data/jenkins.yaml - echo 'openstack_repo_location: http://openstack-repo.cisco.com/openstack/cisco' >> hiera_data/jenkins.yaml + echo 'package_repo: cisco_repo' >> data/hiera_data/jenkins.yaml + echo 'openstack_repo_location: http://openstack-repo.cisco.com/openstack/cisco' >> data/hiera_data/jenkins.yaml #echo 'openstack_repo_location: ftp://ftpeng.cisco.com/openstack/cisco' >> hiera_data/jenkins.yaml - echo 'openstack_release: grizzly-proposed' >> hiera_data/jenkins.yaml + echo 'openstack_release: grizzly-proposed' >> data/hiera_data/jenkins.yaml elif [ $openstack_package_repo = 'cloud_archive' ]; then - echo 'package_repo: cloud_archive' >> hiera_data/jenkins.yaml - echo "openstack_release: precise-updates/${openstack_version}" >> hiera_data/jenkins.yaml + echo 'package_repo: cloud_archive' >> data/hiera_data/jenkins.yaml + echo "openstack_release: precise-updates/${openstack_version}" >> data/hiera_data/jenkins.yaml else echo "Unsupported repo type: ${openstack_package_repo}" fi fi if [ $openstack_version = 'havana' ];then - echo 'network_service: neutron' >> hiera_data/jenkins.yaml + echo 'network_service: neutron' >> data/hiera_data/jenkins.yaml fi if [ "${test_type:-}" = 'swift' ]; then