diff options
8 files changed, 17 insertions, 7 deletions
diff --git a/deploy/adapters/ansible/roles/config-controller/tasks/Ubuntu.yml b/deploy/adapters/ansible/roles/config-controller/tasks/Ubuntu.yml index c878ab7f..e3b467cf 100644 --- a/deploy/adapters/ansible/roles/config-controller/tasks/Ubuntu.yml +++ b/deploy/adapters/ansible/roles/config-controller/tasks/Ubuntu.yml @@ -14,6 +14,8 @@ notify: - restart network service +- meta: flush_handlers + - name: check apt source shell: "ping -c 2 {{LOCAL_REPOSITORY_IP}} > /dev/null" register: checkresult diff --git a/deploy/adapters/ansible/roles/setup-infrastructure/tasks/main.yml b/deploy/adapters/ansible/roles/setup-infrastructure/tasks/main.yml index 5b70aeef..478c4d48 100644 --- a/deploy/adapters/ansible/roles/setup-infrastructure/tasks/main.yml +++ b/deploy/adapters/ansible/roles/setup-infrastructure/tasks/main.yml @@ -19,8 +19,9 @@ register: setup_infrastructure_result - fail: - msg: "there are some task failed when setup host." - when: setup_infrastructure_result.stdout.find('failed=1') != -1 + msg: "there are some task failed when setup infrastructure." + when: setup_infrastructure_result.stdout.find('failed={{item}}') != -1 + with_sequence: start=1 end={{ max_failed_times }} stride=1 - fail: msg: "some host are unreachable." diff --git a/deploy/adapters/ansible/roles/setup-infrastructure/vars/main.yml b/deploy/adapters/ansible/roles/setup-infrastructure/vars/main.yml new file mode 100644 index 00000000..22a990ef --- /dev/null +++ b/deploy/adapters/ansible/roles/setup-infrastructure/vars/main.yml @@ -0,0 +1,2 @@ +--- +max_failed_times: 9 diff --git a/deploy/adapters/ansible/roles/setup-openstack/tasks/main.yml b/deploy/adapters/ansible/roles/setup-openstack/tasks/main.yml index e5770245..b71612f7 100644 --- a/deploy/adapters/ansible/roles/setup-openstack/tasks/main.yml +++ b/deploy/adapters/ansible/roles/setup-openstack/tasks/main.yml @@ -19,7 +19,7 @@ register: setup_openstack_result - fail: - msg: "some task failed when setup host." + msg: "some task failed when setup openstack." when: setup_openstack_result.stdout.find('failed=1') != -1 - fail: diff --git a/deploy/conf/baremetal.conf b/deploy/conf/baremetal.conf index 56903c77..12f3acb7 100644 --- a/deploy/conf/baremetal.conf +++ b/deploy/conf/baremetal.conf @@ -1,5 +1,5 @@ export SWITCH_IPS="192.168.124.2" export SWITCH_CREDENTIAL="version=2c,community=public" -export DEPLOYMENT_TIMEOUT="150" +export DEPLOYMENT_TIMEOUT="300" export POLL_SWITCHES_FLAG="nopoll_switches" export INSTALL_NIC=${INSTALL_NIC:-eth3} diff --git a/deploy/conf/virtual.conf b/deploy/conf/virtual.conf index ab7e5680..1e9034f3 100644 --- a/deploy/conf/virtual.conf +++ b/deploy/conf/virtual.conf @@ -5,5 +5,5 @@ export VIRT_DISK=${VIRT_DISK:-200G} export SWITCH_IPS="1.1.1.1" export SWITCH_CREDENTIAL="version=2c,community=public" -export DEPLOYMENT_TIMEOUT="150" +export DEPLOYMENT_TIMEOUT="300" export POLL_SWITCHES_FLAG="nopoll_switches" diff --git a/plugins/odl_cluster/tasks/control-agents-3.yml b/plugins/odl_cluster/tasks/control-agents-3.yml index 9d7ddebf..68446a83 100644 --- a/plugins/odl_cluster/tasks/control-agents-3.yml +++ b/plugins/odl_cluster/tasks/control-agents-3.yml @@ -13,6 +13,11 @@ crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs bridge_mappings physnet:eth12; when: odl_l3_agent == "Enable" +- name: configure external bridge name for L2 + shell: | + crudini --set /etc/neutron/l3_agent.ini DEFAULT external_network_bridge br-provider; + when: odl_l3_agent == "Disable" + - name: configure opendaylight in ml2 shell: | crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2_odl username admin; diff --git a/plugins/odl_cluster/tasks/control-servers-2.yml b/plugins/odl_cluster/tasks/control-servers-2.yml index 5bfc24eb..59b3aa2f 100644 --- a/plugins/odl_cluster/tasks/control-servers-2.yml +++ b/plugins/odl_cluster/tasks/control-servers-2.yml @@ -19,9 +19,9 @@ crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs bridge_mappings physnet:eth12; when: odl_l3_agent == "Enable" -- name: configure external bridge name for L2 +- name: turn off l3 ha for odl l2 shell: | - crudini --set /etc/neutron/l3_agent.ini DEFAULT external_network_bridge br-provider; + crudini --set /etc/neutron/neutron.conf DEFAULT l3_ha "False"; when: odl_l3_agent == "Disable" - name: configure opendaylight in ml2 |