diff options
| -rw-r--r-- | build/f_isoroot/f_odlpluginbuild/Makefile | 3 | ||||
| -rw-r--r-- | deploy/common.py | 2 | ||||
| -rwxr-xr-x | deploy/deploy.py | 14 |
3 files changed, 16 insertions, 3 deletions
diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile index 024cd4a50..4ae81dd11 100644 --- a/build/f_isoroot/f_odlpluginbuild/Makefile +++ b/build/f_isoroot/f_odlpluginbuild/Makefile @@ -32,8 +32,7 @@ release:.odlbuild sudo gem install fpm sudo pip install fuel-plugin-builder git clone -b $(ODL_BRANCH) $(ODL_REPO) - # Temporary location of working Be snapshot - ODL_TARBALL_LOCATION=http://devel.opt.im/distribution-karaf-0.4.0-20160118.091622-3555.tar.gz fpb --debug --build fuel-plugin-opendaylight/ + fpb --debug --build fuel-plugin-opendaylight/ mv fuel-plugin-opendaylight/opendaylight*.rpm . $(REPOINFO) -r . > gitinfo_odlplugin.txt rm -rf fuel-plugin-opendaylight diff --git a/deploy/common.py b/deploy/common.py index 4b0561cd4..cc418b59b 100644 --- a/deploy/common.py +++ b/deploy/common.py @@ -19,7 +19,7 @@ import errno N = {'id': 0, 'status': 1, 'name': 2, 'cluster': 3, 'ip': 4, 'mac': 5, 'roles': 6, 'pending_roles': 7, 'online': 8, 'group_id': 9} -E = {'id': 0, 'status': 1, 'name': 2, 'release_id': 3, 'pending_release_id': 5} +E = {'id': 0, 'status': 1, 'name': 2, 'release_id': 3, 'pending_release_id': 4} R = {'id': 0, 'name': 1, 'state': 2, 'operating_system': 3, 'version': 4} RO = {'name': 0, 'conflicts': 1} CWD = os.getcwd() diff --git a/deploy/deploy.py b/deploy/deploy.py index 7635cedba..393523bf9 100755 --- a/deploy/deploy.py +++ b/deploy/deploy.py @@ -161,10 +161,24 @@ class AutoDeploy(object): with io.open(file) as f: data = f.read() for key, val in self.fuel_conf.iteritems(): + # skip replacing these keys, as the format is custom + if key in ['ip', 'gw', 'netmask', 'hostname']: + continue + pattern = r'%s=[^ ]\S+' % key replace = '%s=%s' % (key, val) data = re.sub(pattern, replace, data) + # process networking parameters + ip = ':'.join([self.fuel_conf['ip'], + '', + self.fuel_conf['gw'], + self.fuel_conf['netmask'], + self.fuel_conf['hostname'], + 'eth0:off:::']) + + data = re.sub(r'ip=[^ ]\S+', 'ip=%s' % ip, data) + netmask = self.fuel_conf['netmask'] data = self.append_kernel_param(data, 'netmask=%s' % netmask) |