openstack
/
openstack-ansible
Code Issues Proposed changes

Correct path to callback plugins in gate script 

Ansible plugins were recently moved to a separate repo and are now
checked out to /etc/ansible/plugins. Update the path for callback
plugins in the gate check script and remove the MIT license from
LICENSE.txt as this was to account for profile_tasks.py specifically.

Change-Id: Iaf8d300b2d933d52ede24cbbc5be20706abc3d85
This commit is contained in:
Jimmy McCrory 2016-01-31 12:23:21 -08:00 committed by Matt Thompson
parent 7e66566995
commit 951457708f
2 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
LICENSE.txt
View File

@ -200,30 +200,3 @@ Apache License
See the License for the specific language governing permissions and
limitations under the License.
-------------------------------------------------------------------------------
The MIT License (MIT)
Copyright (c) [year] [fullname]
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Files in this project licensed under the MIT license:
- playbooks/plugins/callbacks/profile_tasks.py

2
scripts/gate-check-commit.sh
View File

@ -128,7 +128,7 @@ pushd $(dirname ${0})/../playbooks
wget -O /etc/ansible/plugins/callbacks/human_log.py https://gist.githubusercontent.com/cliffano/9868180/raw/f360f306b3c6d689734a6aa8773a00edf16a0054/human_log.py
# Enable callback plugins
sed -i '/\[defaults\]/a callback_plugins = plugins/callbacks' ansible.cfg
sed -i '/\[defaults\]/a callback_plugins = /etc/ansible/plugins/callbacks' ansible.cfg
popd
# Log some data about the instance and the rest of the system