Commit 4bf79b18 authored by Marco Mariani's avatar Marco Mariani

removed instance variable

parent b48b0161
...@@ -465,9 +465,8 @@ class Slapgrid(object): ...@@ -465,9 +465,8 @@ class Slapgrid(object):
cert_file=self.cert_file, master_ca_file=self.master_ca_file) cert_file=self.cert_file, master_ca_file=self.master_ca_file)
self.computer = self.slap.registerComputer(self.computer_id) self.computer = self.slap.registerComputer(self.computer_id)
# Defines all needed paths # Defines all needed paths
self.instance_etc_directory = os.path.join(self.instance_root, 'etc')
self.supervisord_configuration_directory = \ self.supervisord_configuration_directory = \
os.path.join(self.instance_etc_directory, 'supervisord.conf.d') os.path.join(self.instance_root, 'etc', 'supervisord.conf.d')
self.buildout = buildout self.buildout = buildout
self.promise_timeout = promise_timeout self.promise_timeout = promise_timeout
self.develop = develop self.develop = develop
...@@ -502,11 +501,13 @@ class Slapgrid(object): ...@@ -502,11 +501,13 @@ class Slapgrid(object):
if not os.path.isdir(self.instance_root): if not os.path.isdir(self.instance_root):
raise OSError('%s does not exist.' % self.instance_root) raise OSError('%s does not exist.' % self.instance_root)
# Creates everything needed # Creates everything needed
# Creates instance_root structure # Creates instance_root structure
createPrivateDirectory(self.instance_etc_directory)
createPrivateDirectory(os.path.join(self.instance_root, 'var')) createPrivateDirectory(os.path.join(self.instance_root, 'var'))
createPrivateDirectory(os.path.join(self.instance_root, 'var', 'log')) createPrivateDirectory(os.path.join(self.instance_root, 'var', 'log'))
createPrivateDirectory(os.path.join(self.instance_root, 'var', 'run')) createPrivateDirectory(os.path.join(self.instance_root, 'var', 'run'))
createPrivateDirectory(os.path.join(self.instance_root, 'etc'))
createPrivateDirectory(self.supervisord_configuration_directory) createPrivateDirectory(self.supervisord_configuration_directory)
# Creates supervisord configuration # Creates supervisord configuration
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment