From 586fc4fe2d403ceceae436b0bffdb0745a1448d6 Mon Sep 17 00:00:00 2001 From: Johannes Date: Wed, 26 Oct 2016 10:20:26 +0200 Subject: [PATCH] Revert "CaaS: bring back the userdata.json provision code path" This reverts commit 830972e8ae504d880d1be4adc6a064ecb6c23f23. --- installer/src/server.js | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/installer/src/server.js b/installer/src/server.js index 3cc1eb3c9..2a0b0fec6 100755 --- a/installer/src/server.js +++ b/installer/src/server.js @@ -1,11 +1,12 @@ #!/usr/bin/env node +/* jslint node: true */ + 'use strict'; var assert = require('assert'), debug = require('debug')('installer:server'), express = require('express'), - fs = require('fs'), http = require('http'), HttpError = require('connect-lastmile').HttpError, HttpSuccess = require('connect-lastmile').HttpSuccess, @@ -70,21 +71,8 @@ function stop(callback) { gHttpServer = null; } -function provisionCaaS(callback) { - var PROVISION_CONFIG_FILE = '/root/userdata.json'; - - if (fs.existsSync(PROVISION_CONFIG_FILE)) { - var userData = require(PROVISION_CONFIG_FILE); - installer.provision(userData, callback); - } -} - if (require.main === module) { - provisionCaaS(function (error) { - if (error) return console.error(error); - - start(function (error) { - if (error) console.error(error); - }); + start(function (error) { + if (error) console.error(error); }); }