Move cloud-config.json to cloud-config-novajoin.json
Change-Id: I042392b816cc2b82b98162153fb145f5a6399310
This commit is contained in:
parent
5db0587f37
commit
0915572da0
|
@ -58,7 +58,7 @@ vendordata_providers = StaticJSON, DynamicJSON
|
|||
vendordata_dynamic_targets = 'join@http://127.0.0.1:9999/v1/'
|
||||
vendordata_dynamic_connect_timeout = 5
|
||||
vendordata_dynamic_read_timeout = 30
|
||||
vendordata_jsonfile_path = /etc/nova/cloud-config.json
|
||||
vendordata_jsonfile_path = /etc/nova/cloud-config-novajoin.json
|
||||
|
||||
notification_driver = messaging
|
||||
notification_topic = notifications
|
||||
|
|
|
@ -117,18 +117,11 @@ def install(opts):
|
|||
with open(JOINCONF, 'w') as f:
|
||||
config.write(f)
|
||||
|
||||
FILES = ['cloud-config.json']
|
||||
for fn in FILES:
|
||||
dst = os.path.join(NOVADIR, fn)
|
||||
source = os.path.join(DATADIR, fn)
|
||||
logger.info('Installing %s' % dst)
|
||||
shutil.copyfile(source, dst)
|
||||
|
||||
config = SafeConfigParser()
|
||||
config.read(NOVACONF)
|
||||
config.set('DEFAULT',
|
||||
'vendordata_jsonfile_path',
|
||||
'/etc/nova/cloud-config.json')
|
||||
'/etc/nova/cloud-config-novajoin.json')
|
||||
|
||||
# set the default domain to the IPA domain. This is added to the
|
||||
# instance name to set the hostname.
|
||||
|
|
Loading…
Reference in New Issue