From 8ce84b06eb628e3b1a2145a3bfda75ca12082edb Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 31 Aug 2015 10:36:27 -0400 Subject: Fixes puppet modules to come from Genesis repo This patch deprecates the use of puppet-trystack repo and migrates the puppet modules even to Genesis. deploy.sh now now copies the modules from the current Genesis repo into foreman VM's /vagrant to be used during install (rather than recloning). Associated changes in Khaleesi/QuickStack: - Khaleesi: commit 31b912778847f295d1459a71e5c41c808977c91d - Astapor: commit ac4be11e348d7bcff1e1aa28c96056e18dba5291 JIRA: APEX-8 Change-Id: I322ac797d1d687f17434e07e6775acef8961bdef Signed-off-by: Tim Rozet --- common/puppet-opnfv/manifests/external_net_presetup.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/puppet-opnfv/manifests/external_net_presetup.pp') diff --git a/common/puppet-opnfv/manifests/external_net_presetup.pp b/common/puppet-opnfv/manifests/external_net_presetup.pp index b7c7c5f..96038c0 100644 --- a/common/puppet-opnfv/manifests/external_net_presetup.pp +++ b/common/puppet-opnfv/manifests/external_net_presetup.pp @@ -85,7 +85,7 @@ class opnfv::external_net_presetup { owner => 'root', group => 'root', mode => '0644', - content => template('trystack/br_ex.erb'), + content => template('opnfv/br_ex.erb'), before => Class["quickstack::pacemaker::params"], } -> -- cgit 1.2.3-korg