aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Barabas <peter.barabas@ericsson.com>2016-01-27 11:07:52 +0100
committerStefan Berg <sfb@consultron.com>2016-01-29 14:26:04 +0100
commit4651f81d2deae1512f4033841af173a51a7c6eca (patch)
tree4d6ed6b72db420ca64fd12815bdc89401a09168a
parent19f52239658b8e8b905acf4e8613db51f8d03e02 (diff)
Use Fuel 8 CLI compatible commands
Change-Id: Icd2feed7326772837c74f35688160d1eb0c25652 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com> (cherry picked from commit b4cc8935a0b22c4104cbeec027a7325afff9b3ae)
-rw-r--r--deploy/cloud/configure_environment.py11
-rw-r--r--deploy/common.py5
-rw-r--r--deploy/dea.py3
-rwxr-xr-xdeploy/reap.py9
4 files changed, 8 insertions, 20 deletions
diff --git a/deploy/cloud/configure_environment.py b/deploy/cloud/configure_environment.py
index ed89fa600..1914d7e3e 100644
--- a/deploy/cloud/configure_environment.py
+++ b/deploy/cloud/configure_environment.py
@@ -46,14 +46,11 @@ class ConfigureEnvironment(object):
delete(self.yaml_config_dir)
create_dir_if_not_exists(self.yaml_config_dir)
env_name = self.dea.get_env_name()
- env_mode = self.dea.get_env_mode()
env_net_segment_type = self.dea.get_env_net_segment_type()
- log('Creating environment %s release %s, mode %s, network-mode neutron'
- ', net-segment-type %s'
- % (env_name, self.release_id, env_mode, env_net_segment_type))
- exec_cmd('fuel env create --name %s --release %s --mode %s '
- '--network-mode neutron --net-segment-type %s'
- % (env_name, self.release_id, env_mode, env_net_segment_type))
+ log('Creating environment %s release %s net-segment-type %s'
+ % (env_name, self.release_id, env_net_segment_type))
+ exec_cmd('fuel env create --name %s --release %s --net-segment-type %s'
+ % (env_name, self.release_id, env_net_segment_type))
if not self.env_exists(env_name):
err('Failed to create environment %s' % env_name)
diff --git a/deploy/common.py b/deploy/common.py
index bc2787617..4b0561cd4 100644
--- a/deploy/common.py
+++ b/deploy/common.py
@@ -18,9 +18,8 @@ import stat
import errno
N = {'id': 0, 'status': 1, 'name': 2, 'cluster': 3, 'ip': 4, 'mac': 5,
- 'roles': 6, 'pending_roles': 7, 'online': 8}
-E = {'id': 0, 'status': 1, 'name': 2, 'mode': 3, 'release_id': 4,
- 'changes': 5, 'pending_release_id': 6}
+ 'roles': 6, 'pending_roles': 7, 'online': 8, 'group_id': 9}
+E = {'id': 0, 'status': 1, 'name': 2, 'release_id': 3, 'pending_release_id': 5}
R = {'id': 0, 'name': 1, 'state': 2, 'operating_system': 3, 'version': 4}
RO = {'name': 0, 'conflicts': 1}
CWD = os.getcwd()
diff --git a/deploy/dea.py b/deploy/dea.py
index 2d2b28ae8..b5b63f7cc 100644
--- a/deploy/dea.py
+++ b/deploy/dea.py
@@ -34,9 +34,6 @@ class DeploymentEnvironmentAdapter(object):
def get_env_name(self):
return self.get_property('environment')['name']
- def get_env_mode(self):
- return self.get_property('environment')['mode']
-
def get_env_net_segment_type(self):
return self.get_property('environment')['net_segment_type']
diff --git a/deploy/reap.py b/deploy/reap.py
index 72bfcee4c..dd5b242cf 100755
--- a/deploy/reap.py
+++ b/deploy/reap.py
@@ -75,8 +75,8 @@ DHA_2 = '''
'''
DISKS = {'fuel': '50G',
- 'controller': '60G',
- 'compute': '50G'}
+ 'controller': '100G',
+ 'compute': '100G'}
class Reap(object):
@@ -221,13 +221,8 @@ class Reap(object):
% (self.temp_dir, self.env_id))
network = self.read_yaml(network_file)
- # ha_compact not understood by Fuel when deploying...OD
- if self.env[E['mode']] == 'ha_compact':
- self.env[E['mode']] = 'ha'
-
env = {'environment':
{'name': self.env[E['name']],
- 'mode': self.env[E['mode']],
'net_segment_type':
network['networking_parameters']['segmentation_type']}}
self.write_yaml(self.dea_file, env)