stackforge/puppet_openstack_builder
Code Issues Proposed changes

update hiera writes

Browse Source 
the hiera data has been moved to the data
directory. This commit updates the test script.
This commit is contained in:
Dan Bode
2013-09-04 18:00:06 -07:00
parent 6a4032b1d2
commit 2d65892f2b
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/config.yaml
View File

@@ -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

12
tests/basic_test.sh
View File

@@ -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