diff options
Diffstat (limited to 'apex/settings')
-rw-r--r-- | apex/settings/deploy_settings.py | 6 | ||||
-rw-r--r-- | apex/settings/network_settings.py | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/apex/settings/deploy_settings.py b/apex/settings/deploy_settings.py index 4f887ed0..29fe64fb 100644 --- a/apex/settings/deploy_settings.py +++ b/apex/settings/deploy_settings.py @@ -26,11 +26,11 @@ REQ_DEPLOY_SETTINGS = ['sdn_controller', 'os_version', 'l2gw', 'sriov', - 'containers'] + 'containers', + 'ceph_device'] OPT_DEPLOY_SETTINGS = ['performance', 'vsperf', - 'ceph_device', 'yardstick', 'dovetail', 'odl_vpp_routing_node', @@ -105,6 +105,8 @@ class DeploySettings(dict): self['deploy_options'][req_set] = 'ovs' elif req_set == 'ceph': self['deploy_options'][req_set] = True + elif req_set == 'ceph_device': + self['deploy_options'][req_set] = '/dev/loop3' elif req_set == 'odl_version': self['deploy_options'][req_set] = \ constants.DEFAULT_ODL_VERSION diff --git a/apex/settings/network_settings.py b/apex/settings/network_settings.py index f6566834..36d143cb 100644 --- a/apex/settings/network_settings.py +++ b/apex/settings/network_settings.py @@ -167,10 +167,13 @@ class NetworkSettings(dict): """ _network = self.get_network(network) # if vlan not defined then default it to native - if network is not ADMIN_NETWORK: - for role in ROLES: + for role in ROLES: + if network is not ADMIN_NETWORK: if 'vlan' not in _network['nic_mapping'][role]: _network['nic_mapping'][role]['vlan'] = 'native' + else: + # ctlplane network must be native + _network['nic_mapping'][role]['vlan'] = 'native' cidr = _network.get('cidr') |