Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/136003
Change subject: naggen2: read config from puppet.conf ...................................................................... naggen2: read config from puppet.conf As namespace clashes made it difficult to fetch data from the puppet class, I decided to follow advice I got on the previous change and read directly from puppet.conf. Change-Id: I4e0bac3b93a2bfdcc49c7b3bd8b588af8bac3374 Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org> --- M modules/puppetmaster/files/naggen2 M modules/puppetmaster/manifests/config.pp D modules/puppetmaster/templates/naggen2.conf.erb 3 files changed, 12 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/03/136003/1 diff --git a/modules/puppetmaster/files/naggen2 b/modules/puppetmaster/files/naggen2 index 3ad4736..7e5e6c3 100755 --- a/modules/puppetmaster/files/naggen2 +++ b/modules/puppetmaster/files/naggen2 @@ -58,18 +58,22 @@ """ } - @staticmethod - def load_config(configfile): - config = configparser.SafeConfigParser() - config.read(configfile) - return config + def load_config(self, configfile): + self.config = configparser.SafeConfigParser() + self.config.read(configfile) + self.dsn = "{}://{}:{}@{}:3306/puppet".format( + self.config.get('master', 'dbadapter'), + self.config.get('master', 'dbuser'), + self.config.get('master', 'dbpassword'), + self.config.get('master', 'dbserver') + ) def __init__(self, configfile, debug): self.log = logging.getLogger() self.log.debug('Loading configfile %s', configfile) - self.conf = self.load_config(configfile) + self.load_config(configfile) self.db_engine = sqlalchemy.create_engine( - self.conf.get('db', 'dsn'), + self.dsn, echo=debug ) self.env = jinja2.Environment( @@ -109,7 +113,7 @@ help="type of file to generate", choices=['services', 'hosts', 'hostextinfo']) parser.add_argument( - '--configfile', '-c', dest='configfile', default='/etc/puppet/naggen.conf') + '--configfile', '-c', dest='configfile', default='/etc/puppet/puppet.conf') parser.add_argument('--debug', action='store_true', default=False) args = parser.parse_args() loglevel = logging.DEBUG if args.debug else logging.INFO diff --git a/modules/puppetmaster/manifests/config.pp b/modules/puppetmaster/manifests/config.pp index 62ab261..1747cec 100644 --- a/modules/puppetmaster/manifests/config.pp +++ b/modules/puppetmaster/manifests/config.pp @@ -18,9 +18,5 @@ group => 'root', mode => '0444', content => template('puppetmaster/fileserver.conf.erb'); - '/etc/puppet/naggen.conf': - ensure => 'present', - mode => '0440', - content => template('puppetmaster/naggen2.conf.erb'); } } diff --git a/modules/puppetmaster/templates/naggen2.conf.erb b/modules/puppetmaster/templates/naggen2.conf.erb deleted file mode 100644 index 39b1cd4..0000000 --- a/modules/puppetmaster/templates/naggen2.conf.erb +++ /dev/null @@ -1,2 +0,0 @@ -[db] -dsn = <%= scope.lookupvar('::puppet::config')['dbadapter'] %>://<%= scope.lookupvar('::puppet::config')['dbuser'] %>:<%= scope.lookupvar('::puppet::config')['dbpassword'] %>@<%= scope.lookupvar('::puppet::config')['dbserver'] %>:3306/puppet -- To view, visit https://gerrit.wikimedia.org/r/136003 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e0bac3b93a2bfdcc49c7b3bd8b588af8bac3374 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits