diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-01-08 10:52:57 +0000 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2018-01-08 23:24:10 +0000 |
| commit | 5eaa9da62dabbf31fc83f0c43c6bc56f68468f9c (patch) | |
| tree | e04ab5e994f5f35a6164ef0f0ce527c2d9012739 /xci/scripts | |
| parent | b4a0a044240a09e621f51d1f12f8f02148870c39 (diff) | |
xci: Rename 'nfvi' to 'installer'
Using 'installer' to describe the tool that will deploy the foundations
of a particular XCI scenario is more appropriate than NFVI which
normally describes both the physical and virtual resources needed by
an NFV deployment.
Change-Id: Ib8b1aac58673bf705ce2ff053574fd10cb390d71
Signed-off-by: Markos Chandras <mchandras@suse.de>
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 678ad03f..a8b0cefc 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/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 +# https://review.openstack.org/gitweb?p=openstack/openstack-ansible.git;a=commit;h=$1""" > $releng_xci_base/installer/osa/files/ansible-role-requirements.yml +cat $tempdir/openstack-ansible/ansible-role-requirements.yml >> $releng_xci_base/installer/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}/nfvi/osa/files/. -cp $tempdir/openstack-ansible/global-requirement-pins.txt ${releng_xci_base}/nfvi/osa/files/. +cp $tempdir/openstack-ansible/playbooks/defaults/repo_packages/openstack_services.yml ${releng_xci_base}/installer/osa/files/. +cp $tempdir/openstack-ansible/global-requirement-pins.txt ${releng_xci_base}/installer/osa/files/. popd &> /dev/null @@ -87,9 +87,9 @@ printme "" printme "======================= Report ============================" printme "" printme "The following files have been updated:" -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/installer/osa/files/ansible-role-requirements.yml" +printme "- $releng_xci_base/installer/osa/files/global-requirement-pins.txt" +printme "- $releng_xci_base/installer/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 "" |