x/packstack
Code Issues Proposed changes

Remove requirement of puppet-vlan

Browse Source 
puppet-vlan module is not used anywhere since commit
7497a4e8bb se we can
safely remove it from the list of puppet modules being
deployed from source and copied to other nodes.

Change-Id: I149acd749caa0ca290d2ff620fbc1be036f6bc20
This commit is contained in:
Alfredo Moralejo 2016-05-05 05:53:23 -04:00
parent 4c37e48998
commit aea5776607
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Puppetfile
View File

@ -152,10 +152,6 @@ mod 'vcsrepo',
:git => 'https://github.com/puppetlabs/puppetlabs-vcsrepo', :git => 'https://github.com/puppetlabs/puppetlabs-vcsrepo',
:ref => 'master' :ref => 'master'
mod 'vlan',
:git => 'https://github.com/derekhiggins/puppet-vlan',
:ref => 'master'
mod 'xinetd', mod 'xinetd',
:git => 'https://github.com/puppetlabs/puppetlabs-xinetd', :git => 'https://github.com/puppetlabs/puppetlabs-xinetd',
:ref => 'master' :ref => 'master'

2
packstack/plugins/puppet_950.py
View File

@ -148,7 +148,7 @@ def copy_puppet_modules(config, messages):
'openstacklib', 'oslo', 'packstack', 'rabbitmq', 'openstacklib', 'oslo', 'packstack', 'rabbitmq',
'redis', 'remote', 'rsync', 'sahara', 'ssh', 'redis', 'remote', 'rsync', 'sahara', 'ssh',
'stdlib', 'swift', 'sysctl', 'tempest', 'trove', 'stdlib', 'swift', 'sysctl', 'tempest', 'trove',
'vcsrepo', 'vlan', 'vswitch', 'xinetd', )) 'vcsrepo', 'vswitch', 'xinetd', ))
# write puppet manifest to disk # write puppet manifest to disk
manifestfiles.writeManifests() manifestfiles.writeManifests()