diff options
| -rwxr-xr-x | build/instack.sh | 2 | ||||
| -rw-r--r-- | build/opnfv-tripleo-heat-templates.patch | 2 | ||||
| -rw-r--r-- | docs/installation-instructions/baremetal.rst | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/build/instack.sh b/build/instack.sh index 8b00bbe4..52384689 100755 --- a/build/instack.sh +++ b/build/instack.sh @@ -368,7 +368,7 @@ cp overcloud-full-opendaylight.qcow2 overcloud-full-opendaylight-sfc.qcow2 # upload the opendaylight puppet module rm -rf puppet-opendaylight -git clone -b 3.0.0 https://github.com/dfarrell07/puppet-opendaylight +git clone -b 3.0.1 https://github.com/dfarrell07/puppet-opendaylight pushd puppet-opendaylight git archive --format=tar.gz --prefix=opendaylight/ HEAD > ../puppet-opendaylight.tar.gz popd diff --git a/build/opnfv-tripleo-heat-templates.patch b/build/opnfv-tripleo-heat-templates.patch index c9a10933..10ae0a71 100644 --- a/build/opnfv-tripleo-heat-templates.patch +++ b/build/opnfv-tripleo-heat-templates.patch @@ -1249,7 +1249,7 @@ index 3fb92f3..774f323 100644 +" + + # aodh hacks -+ file { '/etc/ceilometer/event_pipeline': ++ file { '/etc/ceilometer/event_pipeline.yaml': + ensure => present, + content => $event_pipeline + } diff --git a/docs/installation-instructions/baremetal.rst b/docs/installation-instructions/baremetal.rst index 62cbfa2d..3d40eb36 100644 --- a/docs/installation-instructions/baremetal.rst +++ b/docs/installation-instructions/baremetal.rst @@ -1,2 +1,2 @@ -.. include:: ../configguide/baremetal.rst +.. include:: ../configguide/baremetalinstall.rst |