From b1c66830c2fa87d07b79fb6706a2eb644d39d471 Mon Sep 17 00:00:00 2001 From: Georg Kunz Date: Sun, 12 Feb 2017 01:33:05 +0100 Subject: Extending Gluon puppet manifests * correctly reading etcd data from hieradata * template for proton.conf config file Change-Id: I62728f84a932d1dfef54b548a1e97b22bf06fcd8 Signed-off-by: Georg Kunz --- deploy/puppet/gluon/manifests/init.pp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'deploy/puppet/gluon/manifests/init.pp') diff --git a/deploy/puppet/gluon/manifests/init.pp b/deploy/puppet/gluon/manifests/init.pp index ec1e036..0225533 100644 --- a/deploy/puppet/gluon/manifests/init.pp +++ b/deploy/puppet/gluon/manifests/init.pp @@ -1,11 +1,15 @@ class gluon inherits ::gluon::params { + $bind_ip = $::gluon::params::bind_ip + $port = $::gluon::params::port + $odl_bind_ip = hiera(opendaylight::odl_bind_ip, $::gluon::params::odl_bind_ip) $odl_rest_port = hiera(opendaylight::odl_rest_port, $::gluon::params::odl_rest_port) $odl_username = hiera(opendaylight::username, $::gluon::params::odl_username) $odl_password = hiera(opendaylight::password, $::gluon::params::odl_password) - $etcd_bind_ip = hiera(etcd::bind_ip, $::gluon::params::etcd_bind_ip) - $etcd_client_port = hiera(etcd::client_port, $::gluon::params::etcd_client_port) + + $etcd_bind_ip = hiera(tripleo::profile::base::etcd::bind_ip, $::gluon::params::etcd_bind_ip) + $etcd_client_port = hiera(tripleo::profile::base::etcd::client_port, $::gluon::params::etcd_client_port) class { '::gluon::install': } -> class { '::gluon::config': } ~> -- cgit 1.2.3-korg