diff options
| -rw-r--r-- | deploy/deploy-config.py | 1 | ||||
| -rw-r--r-- | deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml | 2 | ||||
| -rw-r--r-- | deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/deploy/deploy-config.py b/deploy/deploy-config.py index 436002d36..8896080db 100644 --- a/deploy/deploy-config.py +++ b/deploy/deploy-config.py @@ -137,7 +137,6 @@ def merge_networks(list_1, list_2): return [new_nets.get(net.get('name'), net) for net in list_1] - def merge_dicts(dict1, dict2): for k in set(dict1).union(dict2): if k in dict1 and k in dict2: diff --git a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml index 82b343ead..51deb4e28 100644 --- a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml @@ -77,7 +77,7 @@ dea-override-config: value: 128 nova: value: - '2048': 256 + '2048': 1024 network: networking_parameters: diff --git a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml index c1dca2e10..7ab76cbcf 100644 --- a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml @@ -75,7 +75,7 @@ dea-override-config: value: 128 nova: value: - '2048': 256 + '2048': 1024 network: networking_parameters: |