diff options
Diffstat (limited to 'deploy/adapters/ansible/openstack')
| -rw-r--r-- | deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml | 7 | ||||
| -rw-r--r-- | deploy/adapters/ansible/openstack/group_vars/all | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml index 29796323..663f02b8 100644 --- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml +++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml @@ -1,12 +1,11 @@ -############################################################################## +# ############################################################################# # Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - +# ############################################################################# --- - hosts: all remote_user: root @@ -31,6 +30,6 @@ - role: setup-infrastructure - role: setup-openstack - role: setup-openvswitch - when: NEUTRON_MECHANISM_DRIVERS[0] == "openvswitch" or + when: NEUTRON_MECHANISM_DRIVERS[0] == "openvswitch" or NEUTRON_MECHANISM_DRIVERS[0] == "opendaylight" - role: openstack-post diff --git a/deploy/adapters/ansible/openstack/group_vars/all b/deploy/adapters/ansible/openstack/group_vars/all index 54fdabe1..79859d0c 100644 --- a/deploy/adapters/ansible/openstack/group_vars/all +++ b/deploy/adapters/ansible/openstack/group_vars/all @@ -38,7 +38,6 @@ NEUTRON_TUNNEL_TYPES: ['vxlan'] METADATA_SECRET: metadata_secret INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: 10.1.1.21 INTERFACE_NAME: eth2 -DNS: 8.8.8.8 EXTERNAL_NETWORK_CIDR: 203.0.113.0/24 EXTERNAL_NETWORK_GATEWAY: 203.0.113.1 |