diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-12-20 10:12:42 +0000 |
|---|---|---|
| committer |   Fatih Degirmenci <fdegir@gmail.com> | 2017-12-21 00:28:52 +0100 |
| commit | c74cfd33fc3c8274433f153f1d211b7b2657ab54 (patch) | |
| tree | 252c2aae1f81393300714abab472b0242c3db936 /xci/scripts | |
| parent | 8662864a166d9e89ba8058c871526b3ad94aae21 (diff) | |
xci: OSA: Move all the OSA specific playbooks to the NFVI directory
Move all the playbooks that only make sense for OpenStack-Ansible
deployments to the NFVI/OSA directory where they belong. This further
disassociates XCI from OSA.
Change-Id: Iab8b6dc81d9025a1d85608a98fb1eee0f1c6a69f
Signed-off-by: Markos Chandras <mchandras@suse.de>
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Diffstat (limited to 'xci/scripts')
| -rwxr-xr-x | xci/scripts/update-osa-version-files.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xci/scripts/update-osa-version-files.sh b/xci/scripts/update-osa-version-files.sh index 52e21ca5..678ad03f 100755 --- a/xci/scripts/update-osa-version-files.sh +++ b/xci/scripts/update-osa-version-files.sh @@ -66,8 +66,8 @@ echo """--- # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## # these versions are based on the osa commit ${1} on $(git --no-pager log -1 --format=%cd --date=format:%Y-%m-%d $1) -# https://review.openstack.org/gitweb?p=openstack/openstack-ansible.git;a=commit;h=$1""" > $releng_xci_base/file/ansible-role-requirements.yml -cat $tempdir/openstack-ansible/ansible-role-requirements.yml >> $releng_xci_base/file/ansible-role-requirements.yml +# https://review.openstack.org/gitweb?p=openstack/openstack-ansible.git;a=commit;h=$1""" > $releng_xci_base/nfvi/osa/files/ansible-role-requirements.yml +cat $tempdir/openstack-ansible/ansible-role-requirements.yml >> $releng_xci_base/nfvi/osa/files/ansible-role-requirements.yml # Update the pinned OSA version sed -i -e "/^export OPENSTACK_OSA_VERSION/s@:-\"[a-z0-9]*@:-\"${1}@" \ @@ -78,8 +78,8 @@ sed -i -e "/^export OPENSTACK_OSA_VERSION/s@:-\"[a-z0-9]*@:-\"${1}@" \ sed -i -e "/^export OPENSTACK_BIFROST_VERSION/s@:-\"[a-z0-9]*@:-\"${2}@" \ -e "s/\(^# HEAD of bifrost.*of \).*/\1$(date +%d\.%m\.%Y)/" $releng_xci_base/config/pinned-versions -cp $tempdir/openstack-ansible/playbooks/defaults/repo_packages/openstack_services.yml ${releng_xci_base}/file/. -cp $tempdir/openstack-ansible/global-requirement-pins.txt ${releng_xci_base}/file/. +cp $tempdir/openstack-ansible/playbooks/defaults/repo_packages/openstack_services.yml ${releng_xci_base}/nfvi/osa/files/. +cp $tempdir/openstack-ansible/global-requirement-pins.txt ${releng_xci_base}/nfvi/osa/files/. popd &> /dev/null @@ -87,9 +87,9 @@ printme "" printme "======================= Report ============================" printme "" printme "The following files have been updated:" -printme "- $releng_xci_base/file/ansible-role-requirements.yml" -printme "- $releng_xci_base/file/global-requirement-pins.txt" -printme "- $releng_xci_base/file/openstack_services.yml" +printme "- $releng_xci_base/nfvi/osa/files/ansible-role-requirements.yml" +printme "- $releng_xci_base/nfvi/osa/files/global-requirement-pins.txt" +printme "- $releng_xci_base/nfvi/osa/files/openstack_services.yml" printme "- $releng_xci_base/config/pinned-versions" printme "Please make sure you test the end result before committing it!" printme "" |