From aea5776607b00218ae74fe7f5a996d740a0f2bbc Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Thu, 5 May 2016 05:53:23 -0400 Subject: [PATCH] Remove requirement of puppet-vlan puppet-vlan module is not used anywhere since commit 7497a4e8bb8d4e19bfc247bcff002bd0f7b9f992 se we can safely remove it from the list of puppet modules being deployed from source and copied to other nodes. Change-Id: I149acd749caa0ca290d2ff620fbc1be036f6bc20 --- Puppetfile | 4 ---- packstack/plugins/puppet_950.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Puppetfile b/Puppetfile index a592d47ed..94605b1c2 100644 --- a/Puppetfile +++ b/Puppetfile @@ -152,10 +152,6 @@ mod 'vcsrepo', :git => 'https://github.com/puppetlabs/puppetlabs-vcsrepo', :ref => 'master' -mod 'vlan', - :git => 'https://github.com/derekhiggins/puppet-vlan', - :ref => 'master' - mod 'xinetd', :git => 'https://github.com/puppetlabs/puppetlabs-xinetd', :ref => 'master' diff --git a/packstack/plugins/puppet_950.py b/packstack/plugins/puppet_950.py index 496c6e4ff..23962e1c8 100644 --- a/packstack/plugins/puppet_950.py +++ b/packstack/plugins/puppet_950.py @@ -148,7 +148,7 @@ def copy_puppet_modules(config, messages): 'openstacklib', 'oslo', 'packstack', 'rabbitmq', 'redis', 'remote', 'rsync', 'sahara', 'ssh', 'stdlib', 'swift', 'sysctl', 'tempest', 'trove', - 'vcsrepo', 'vlan', 'vswitch', 'xinetd', )) + 'vcsrepo', 'vswitch', 'xinetd', )) # write puppet manifest to disk manifestfiles.writeManifests()