aboutsummaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
Diffstat (limited to 'deploy')
-rw-r--r--deploy/cloud/deployment.py13
-rw-r--r--deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml29
-rw-r--r--deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml29
3 files changed, 59 insertions, 12 deletions
diff --git a/deploy/cloud/deployment.py b/deploy/cloud/deployment.py
index 28bcfdf1d..7f791cbc6 100644
--- a/deploy/cloud/deployment.py
+++ b/deploy/cloud/deployment.py
@@ -24,6 +24,8 @@ LOG_FILE = '/var/log/puppet.log'
GREP_LINES_OF_LEADING_CONTEXT = 100
GREP_LINES_OF_TRAILING_CONTEXT = 100
LIST_OF_CHAR_TO_BE_ESCAPED = ['[', ']', '"']
+ERROR_MSGS = ['Critical nodes are not available for deployment',
+ 'offline. Remove them from environment and try again.']
class DeployNotStart(Exception):
@@ -112,8 +114,8 @@ class Deployment(object):
ready = False
timeout = False
- attempts = 0
- while attempts < 3:
+ attempts = 5
+ while attempts > 0:
try:
if time.time() > start + abort_after:
timeout = True
@@ -132,7 +134,7 @@ class Deployment(object):
time.sleep(SLEEP_TIME)
except (DeployNotStart, NodesGoOffline) as e:
log(e)
- attempts += 1
+ attempts -= 1
deploy_id = None
time.sleep(SLEEP_TIME * attempts)
@@ -164,8 +166,7 @@ class Deployment(object):
def _deployment_status(self, id):
task = self._task_fields(id)
if task['status'] == 'error':
- if task['message'].endswith(
- 'offline. Remove them from environment and try again.'):
+ if any(msg in task['message'] for msg in ERROR_MSGS):
raise NodesGoOffline(task['message'])
return task['status'], task['progress'], task['message']
@@ -190,7 +191,7 @@ class Deployment(object):
exec_cmd('rm -f /var/log/remote/fuel-snapshot-*', False)
exec_cmd('rm -f /root/deploy-*', False)
log('Generating Fuel deploy snap-shot')
- if exec_cmd('fuel snapshot < /dev/null &> snapshot.log', False)[1] <> 0:
+ if exec_cmd('fuel snapshot < /dev/null &> snapshot.log', False)[1] != 0:
log('Could not create a Fuel snapshot')
else:
exec_cmd('mv /root/fuel-snapshot* /var/log/remote/', False)
diff --git a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml
index 5f90320f1..645f48d21 100644
--- a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml
@@ -51,15 +51,17 @@ dea-override-config:
fuel:
FEATURE_GROUPS:
- experimental
+ environment:
+ net_segment_type: vlan
nodes:
- id: 1
- interfaces: interfaces_1
+ interfaces: interfaces_vlan
role: controller
- id: 2
- interfaces: interfaces_1
+ interfaces: interfaces_vlan
role: mongo,controller
- id: 3
- interfaces: interfaces_1
+ interfaces: interfaces_vlan
role: ceph-osd,controller
- id: 4
interfaces: interfaces_dpdk
@@ -78,6 +80,27 @@ dea-override-config:
value:
'2048': 1024
+ network:
+ networking_parameters:
+ segmentation_type: vlan
+ networks:
+ - cidr: null
+ gateway: null
+ ip_ranges: []
+ meta:
+ configurable: false
+ map_priority: 2
+ name: private
+ neutron_vlan_range: true
+ notation: null
+ render_addr_mask: null
+ render_type: null
+ seg_type: vlan
+ use_gateway: false
+ vlan_start: null
+ name: private
+ vlan_start: null
+
settings:
editable:
storage:
diff --git a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
index cdf06de24..784883513 100644
--- a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
@@ -46,15 +46,17 @@ dea-override-config:
fuel:
FEATURE_GROUPS:
- experimental
+ environment:
+ net_segment_type: vlan
nodes:
- id: 1
- interfaces: interfaces_1
+ interfaces: interfaces_vlan
role: controller
- id: 2
- interfaces: interfaces_1
+ interfaces: interfaces_vlan
role: mongo,controller
- id: 3
- interfaces: interfaces_1
+ interfaces: interfaces_vlan
role: ceph-osd,controller
- id: 4
interfaces: interfaces_dpdk
@@ -73,6 +75,27 @@ dea-override-config:
value:
'2048': 1024
+ network:
+ networking_parameters:
+ segmentation_type: vlan
+ networks:
+ - cidr: null
+ gateway: null
+ ip_ranges: []
+ meta:
+ configurable: false
+ map_priority: 2
+ name: private
+ neutron_vlan_range: true
+ notation: null
+ render_addr_mask: null
+ render_type: null
+ seg_type: vlan
+ use_gateway: false
+ vlan_start: null
+ name: private
+ vlan_start: null
+
settings:
editable:
storage: