From eb5debbdbbe8c9907bb91275ac78e90dbda69c89 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Thu, 10 Aug 2017 19:13:14 -0500 Subject: [PATCH] move mnaio network group var because it's shared Change-Id: I3c85564def49f3d0da76c55dc4356cbf16a25d63 Signed-off-by: Kevin Carter --- multi-node-aio/playbooks/group_vars/all.yml | 34 +++++++++++++++++++ .../playbooks/group_vars/mnaio_hosts.yml | 33 ------------------ 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/multi-node-aio/playbooks/group_vars/all.yml b/multi-node-aio/playbooks/group_vars/all.yml index a947a4ef..de8f50e7 100644 --- a/multi-node-aio/playbooks/group_vars/all.yml +++ b/multi-node-aio/playbooks/group_vars/all.yml @@ -64,3 +64,37 @@ images: vm: url: "tftp://{{ tftp_server }}/preseed/vm.preseed" template_name: "vm.preseed" + + +# mnaio_data_disk: 'sdc' # str - not required, set this to define a given data disk if no data disk +# is defined the largest unpartitioned disk will be used. +mnaio_host_networks: + dhcp: + iface: 'vm-br-dhcp' # str - required, interface name + inet_type: 'static' # str - required, iface type [static, dhcp, manual] + address: '10.0.2.1/22' # str - not required, must be in CIDR format + iface_port: none # str - required, physical port used within a host bridge + mgmt: + iface: 'vm-br-eth1' + inet_type: 'static' + address: '10.0.236.1/22' + iface_port: none + flat: + iface: 'vm-br-eth2' + inet_type: 'static' + address: '10.0.248.1/22' + iface_port: none + vlan: + iface: 'vm-br-eth3' + inet_type: 'manual' + iface_port: none + vxlan: + iface: 'vm-br-eth4' + inet_type: 'manual' + address: '10.0.240.1/22' + iface_port: none + storage: + iface: 'vm-br-eth5' + inet_type: 'manual' + address: '10.0.244.1/22' + iface_port: none diff --git a/multi-node-aio/playbooks/group_vars/mnaio_hosts.yml b/multi-node-aio/playbooks/group_vars/mnaio_hosts.yml index 2f1bf580..6ce96282 100644 --- a/multi-node-aio/playbooks/group_vars/mnaio_hosts.yml +++ b/multi-node-aio/playbooks/group_vars/mnaio_hosts.yml @@ -11,39 +11,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# mnaio_data_disk: 'sdc' # str - not required, set this to define a given data disk if no data disk -# is defined the largest unpartitioned disk will be used. -mnaio_host_networks: - dhcp: - iface: 'vm-br-dhcp' # str - required, interface name - inet_type: 'static' # str - required, iface type [static, dhcp, manual] - address: '10.0.2.1/22' # str - not required, must be in CIDR format - iface_port: none # str - required, physical port used within a host bridge - mgmt: - iface: 'vm-br-eth1' - inet_type: 'static' - address: '10.0.236.1/22' - iface_port: none - flat: - iface: 'vm-br-eth2' - inet_type: 'static' - address: '10.0.248.1/22' - iface_port: none - vlan: - iface: 'vm-br-eth3' - inet_type: 'manual' - iface_port: none - vxlan: - iface: 'vm-br-eth4' - inet_type: 'manual' - address: '10.0.240.1/22' - iface_port: none - storage: - iface: 'vm-br-eth5' - inet_type: 'manual' - address: '10.0.244.1/22' - iface_port: none - mnaio_host_iptables_rules: - table: filter chain: INPUT