diff options
| -rw-r--r-- | apex/overcloud/config.py | 4 | ||||
| -rw-r--r-- | apex/overcloud/overcloud_deploy.py | 2 | ||||
| -rw-r--r-- | lib/ansible/playbooks/deploy_overcloud.yml | 8 |
3 files changed, 9 insertions, 5 deletions
diff --git a/apex/overcloud/config.py b/apex/overcloud/config.py index 6e116de2..acec5323 100644 --- a/apex/overcloud/config.py +++ b/apex/overcloud/config.py @@ -44,7 +44,7 @@ def create_nic_template(network_settings, deploy_settings, role, template_dir, ovs_dpdk_br = '' if ds['dataplane'] == 'fdio': nets['tenant']['nic_mapping'][role]['phys_type'] = 'vpp_interface' - if ds['sdn_controller'] == 'opendaylight': + if ds['sdn_controller'] == 'opendaylight' and role == 'compute': nets['external'][0]['nic_mapping'][role]['phys_type'] = \ 'vpp_interface' ext_net = 'vpp_interface' @@ -54,7 +54,7 @@ def create_nic_template(network_settings, deploy_settings, role, template_dir, .get('uio-driver')): nets['tenant']['nic_mapping'][role]['uio-driver'] =\ ds['performance'][role.title()]['vpp']['uio-driver'] - if ds['sdn_controller'] == 'opendaylight': + if ds['sdn_controller'] == 'opendaylight' and role == 'compute': nets['external'][0]['nic_mapping'][role]['uio-driver'] =\ ds['performance'][role.title()]['vpp']['uio-driver'] if (ds.get('performance', {}).get(role.title(), {}).get('vpp', {}) diff --git a/apex/overcloud/overcloud_deploy.py b/apex/overcloud/overcloud_deploy.py index 518df0dd..60652146 100644 --- a/apex/overcloud/overcloud_deploy.py +++ b/apex/overcloud/overcloud_deploy.py @@ -85,7 +85,7 @@ def build_sdn_env_list(ds, sdn_map, env_list=None): if len(env_list) == 0: try: env_list.append(os.path.join( - con.THT_ENV_DIR, sdn_map[ds['sdn_controller']]['default'])) + con.THT_ENV_DIR, sdn_map['default'])) except KeyError: logging.warning("Unable to find default file for SDN") diff --git a/lib/ansible/playbooks/deploy_overcloud.yml b/lib/ansible/playbooks/deploy_overcloud.yml index 3313bc87..a16c81f5 100644 --- a/lib/ansible/playbooks/deploy_overcloud.yml +++ b/lib/ansible/playbooks/deploy_overcloud.yml @@ -48,8 +48,12 @@ - compute - name: Configure DNS server for ctlplane network shell: "{{ stackrc }} && openstack subnet set ctlplane-subnet {{ dns_server_args }}" - - name: Execute Overcloud Deployment - shell: "{{ stackrc }} && bash deploy_command" + - block: + - name: Execute Overcloud Deployment + shell: "{{ stackrc }} && bash deploy_command" + rescue: + - name: Show overcloud failures + shell: "{{ stackrc }} && openstack stack failures list overcloud --long" - name: Show Keystone output shell: "{{ overcloudrc }} && {{ item }}" when: debug |