diff options
| author |   zhongjun <zhong.jun@zte.com.cn> | 2017-04-27 22:15:40 +0800 |
|---|---|---|
| committer | zhongjun <zhong.jun@zte.com.cn> | 2017-05-03 18:43:21 +0800 |
| commit | a7e8ac7aa6cf5bdefb80fdd051a2162b4f7d6108 (patch) | |
| tree | ab855ce492530441d80968d27cb809e262eaa2de | |
| parent | 17db096d1bbbaabd30add632fc91e4e48afc990f (diff) | |
Hardcoded physnet1 changed to obtain from .yml
the physical network device of external network is hardcode to
'physnet1',change it to obtain from network.yml configuration
file.
Change-Id: Id2e45ac488619db2247e73cc3fed5706db31d9e9
Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
| -rwxr-xr-x | ci/deploy/deploy.sh | 1 | ||||
| -rw-r--r-- | deploy/config/vm_environment/zte-virtual1/network.yml | 1 | ||||
| -rw-r--r-- | deploy/config/vm_environment/zte-virtual2/network.yml | 1 | ||||
| -rw-r--r-- | deploy/post/execute.py | 7 |
4 files changed, 6 insertions, 4 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index 75d30047..be17dfa7 100755 --- a/ci/deploy/deploy.sh +++ b/ci/deploy/deploy.sh @@ -374,7 +374,6 @@ fi echo "====== deploy successfully ======" exit 0 - # # END of main ############################################################################ diff --git a/deploy/config/vm_environment/zte-virtual1/network.yml b/deploy/config/vm_environment/zte-virtual1/network.yml index 6c8a2824..34b466a2 100644 --- a/deploy/config/vm_environment/zte-virtual1/network.yml +++ b/deploy/config/vm_environment/zte-virtual1/network.yml @@ -33,6 +33,7 @@ networks: end: 172.10.101.20
name: EXTERNAL
network_name: admin_external
+ mapping: physnet1
- cidr: '10.20.11.0/24'
gateway: '10.20.11.1'
ip_ranges:
diff --git a/deploy/config/vm_environment/zte-virtual2/network.yml b/deploy/config/vm_environment/zte-virtual2/network.yml index 28d531ce..9477ab9c 100644 --- a/deploy/config/vm_environment/zte-virtual2/network.yml +++ b/deploy/config/vm_environment/zte-virtual2/network.yml @@ -33,6 +33,7 @@ networks: end: 172.10.101.20
name: EXTERNAL
network_name: admin_external
+ mapping: physnet1
- cidr: '10.20.11.0/24'
gateway: '10.20.11.1'
ip_ranges:
diff --git a/deploy/post/execute.py b/deploy/post/execute.py index d310acbc..37a67b4c 100644 --- a/deploy/post/execute.py +++ b/deploy/post/execute.py @@ -16,14 +16,14 @@ import nova from deploy.config.network import NetworkConfig -def _config_external_network(ext_name): +def _config_external_network(ext_name, physnet): body = { 'network': { 'name': ext_name, 'admin_state_up': True, 'shared': False, 'provider:network_type': 'flat', - 'provider:physical_network': 'physnet1', + 'provider:physical_network': physnet, 'router:external': True } } @@ -50,9 +50,10 @@ def _config_external_subnet(ext_id, network_conf): def _create_external_network(network_file): network_conf = NetworkConfig(network_file=network_file) ext_name = network_conf.ext_network_name + physnet = network_conf.ext_mapping neutronclient = neutron.Neutron() ext_id = neutronclient.create_network(ext_name, - _config_external_network(ext_name)) + _config_external_network(ext_name, physnet)) neutronclient.create_subnet(_config_external_subnet(ext_id, network_conf)) |