openstack/openstack-ansible
Code Issues Proposed changes

Merge "Added flag to instruct yaprt to ignore tempest"

Browse Source
This commit is contained in:
Jenkins 2015-06-22 17:31:40 +00:00 committed by Gerrit Code Review
commit 1eb53d58fa
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
playbooks/defaults/repo_packages/openstack_services.yml
View File

@ -91,4 +91,5 @@ swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}"
## Tempest service ## Tempest service
tempest_git_repo: https://github.com/openstack/tempest tempest_git_repo: https://github.com/openstack/tempest
tempest_git_install_branch: 9927d643c7340cc55a351cc8ed159d7dd3ba0c54 # HEAD of "master" as of 08.06.2015 tempest_git_install_branch: 9927d643c7340cc55a351cc8ed159d7dd3ba0c54 # HEAD of "master" as of 08.06.2015
tempest_git_install_fragments: "yaprtignorerequirements=true"
tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}" tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}"

9
playbooks/plugins/lookups/py_pkgs.py
View File

@ -122,6 +122,9 @@ class DependencyFileProcessor(object):
) )
) )
if git_data['fragments']:
package = '%s&%s' % (package, git_data['fragments'])
self.pip['git_package'].append(package) self.pip['git_package'].append(package)
def _process_git(self, loaded_yaml, git_item): def _process_git(self, loaded_yaml, git_item):
@ -151,6 +154,12 @@ class DependencyFileProcessor(object):
git_data['repo'], git_data['branch'] git_data['repo'], git_data['branch']
) )
git_data['fragments'] = loaded_yaml.get(
'%s_git_install_fragments' % var_name.replace('.', '_')
)
if git_data['fragments']:
package = '%s#%s' % (package, git_data['fragments'])
self.pip['git_package'].append(package) self.pip['git_package'].append(package)
git_repo_plugins = loaded_yaml.get('%s_repo_plugins' % var_name) git_repo_plugins = loaded_yaml.get('%s_repo_plugins' % var_name)