diff options
| author |   Dan Radez <dradez@redhat.com> | 2015-09-04 14:38:56 -0400 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2015-09-04 14:43:31 -0400 |
| commit | 8f49d7a5efc0e847ecffcb05f6aff2186d8cecc9 (patch) | |
| tree | 0970daa3d2c30f93fe6aa40cfbfb63549e5182d6 /common/puppet-opnfv/manifests/external_net_presetup.pp | |
| parent | ab4950db472c20b57bff533f1f330b5b794aa35b (diff) | |
| parent | 591a1c4327c0793b4a15443f9e72b79ffbeaa226 (diff) | |
Merge branch 'master' into merge-master-arno
Change-Id: Idbe1d8ba5f1fe44ae5c5e407d5999c28909639c5
Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'common/puppet-opnfv/manifests/external_net_presetup.pp')
| -rw-r--r-- | common/puppet-opnfv/manifests/external_net_presetup.pp | 2 |
1 files changed, 1 insertions, 1 deletions
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"], } -> |