diff options
| author |   Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2017-12-25 12:06:29 -0500 |
|---|---|---|
| committer | Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2017-12-25 16:41:33 -0500 |
| commit | 6c6d834baf09bfe58266d58a84b1cd85dbd5e249 (patch) | |
| tree | 5103ca09f9870dfd7e5b7d7fe577c63f2198d068 | |
| parent | 27cb947c971bda2ee6ee39345250580ff75f7d7e (diff) | |
Now SDL cluster use kolla_internal_vip_address as VIP
Change-Id: Id22c86d4d2c7c18bba36dc9b50cd56bf75d94053
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
| -rw-r--r-- | deploy/post/execute.py | 4 | ||||
| -rw-r--r-- | tests/data/openrc_conf/globals_odl.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/deploy/post/execute.py b/deploy/post/execute.py index fe4185b8..6acbe637 100644 --- a/deploy/post/execute.py +++ b/deploy/post/execute.py @@ -20,8 +20,8 @@ from deploy.utils import err_exit def _config_kolla_admin_openrc(kolla_config_path): with open('%s/globals.yml' % kolla_config_path, 'r') as f: kolla_config = yaml.safe_load(f.read()) - if kolla_config.get('opendaylight_leader_ip_address'): - sdn_controller_ip = kolla_config.get('opendaylight_leader_ip_address') + if kolla_config.get('enable_opendaylight', None) == 'yes': + sdn_controller_ip = kolla_config.get('kolla_internal_vip_address') openrc_file = file('%s/admin-openrc.sh' % kolla_config_path, 'a') sdn_ctl_ip = 'export SDN_CONTROLLER_IP=' + sdn_controller_ip + '\n' openrc_file.write(sdn_ctl_ip) diff --git a/tests/data/openrc_conf/globals_odl.yml b/tests/data/openrc_conf/globals_odl.yml index 50df4084..588dd927 100644 --- a/tests/data/openrc_conf/globals_odl.yml +++ b/tests/data/openrc_conf/globals_odl.yml @@ -2,6 +2,7 @@ docker_namespace: kolla docker_registry: 10.20.11.2:4000 enable_ceph: 'yes' enable_cinder: 'yes' +enable_opendaylight: 'yes' keepalived_interface: ens9 kolla_external_vip_interface: ens3 kolla_internal_vip_address: 10.20.11.11 @@ -10,4 +11,3 @@ neutron_external_interface: ens8 openstack_release: 4.0.2 storage_interface: ens3 tunnel_interface: ens3 -opendaylight_leader_ip_address: 10.20.7.3
\ No newline at end of file |