From 3b6f139b066fa61df852f480be3a583479c78eb6 Mon Sep 17 00:00:00 2001 From: Zhou Ya Date: Thu, 9 Feb 2017 16:19:19 +0800 Subject: Baremetal Deployment on zte-pod2 JIRA: DAISY-30 Change-Id: Ie34180b9d036797d310f612caa189b0a06efb732 Signed-off-by: Zhou Ya --- .../bm_environment/zte-baremetal1/deploy.yml | 23 ++++ .../bm_environment/zte-baremetal1/network.yml | 59 +++++++++++ .../config/vm_environment/zte-virtual1/deploy.yml | 25 ++--- .../config/vm_environment/zte-virtual1/network.yml | 118 ++++++++++----------- 4 files changed, 154 insertions(+), 71 deletions(-) create mode 100644 deploy/config/bm_environment/zte-baremetal1/deploy.yml create mode 100644 deploy/config/bm_environment/zte-baremetal1/network.yml (limited to 'deploy/config') diff --git a/deploy/config/bm_environment/zte-baremetal1/deploy.yml b/deploy/config/bm_environment/zte-baremetal1/deploy.yml new file mode 100644 index 00000000..eafff5fd --- /dev/null +++ b/deploy/config/bm_environment/zte-baremetal1/deploy.yml @@ -0,0 +1,23 @@ +hosts: +- name: 'controller01' + roles: + - 'CONTROLLER_LB' +- name: 'controller02' + roles: + - 'CONTROLLER_LB' +- name: 'controller03' + roles: + - 'CONTROLLER_LB' +- name: 'computer01' + roles: + - 'COMPUTER' +- name: 'computer02' + roles: + - 'COMPUTER' +disks: + daisy: 50 + controller: 50 + compute: 50 +daisy_passwd: 'r00tme' +daisy_ip: '10.20.7.3' +daisy_gateway: '10.20.7.1' diff --git a/deploy/config/bm_environment/zte-baremetal1/network.yml b/deploy/config/bm_environment/zte-baremetal1/network.yml new file mode 100644 index 00000000..53f21d90 --- /dev/null +++ b/deploy/config/bm_environment/zte-baremetal1/network.yml @@ -0,0 +1,59 @@ +############################################################################## +# Copyright (c) 2017 ZTE Coreporation and others. +# hu.zhijiang@zte.com.cn +# sun.jing22@zte.com.cn +# 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 +############################################################################## + +network-config-metadata: + title: 'zte-bm-deploy network config' + version: '0.1' + created: 'Mon Oct 31 2016' + comment: +networks: + - cidr: '10.20.7.0/24' + gateway: '10.20.7.1' + ip_ranges: + - 'start': '10.20.7.4' + 'end': '10.20.7.11' + name: 'MANAGEMENT' + - cidr: '10.20.7.0/24' + gateway: '10.20.7.1' + ip_ranges: + - start: '10.20.7.4' + end: '10.20.7.11' + name: 'STORAGE' + - cidr: '172.10.101.0/24' + gateway: '172.10.101.0' + ip_ranges: + - 'start': '172.10.101.1' + 'end': '172.10.101.10' + 'name': 'EXTERNAL' + - cidr: '10.20.7.0/24' + gateway: '10.20.7.1' + ip_ranges: + - 'start': '10.20.7.4' + 'end': '10.20.7.11' + name: 'PUBLICAPI' + - cidr: '10.20.7.0/24' + gateway: '10.20.7.1' + ip_ranges: + - 'start': '10.20.7.4' + 'end': '10.20.7.11' + name: 'TENANT' +interfaces: + - name: 'EXTERNAL' + interface: 'ens12f1' + - name: 'MANAGEMENT' + interface: 'ens4f0' + - name: 'PUBLICAPI' + interface: 'ens4f0' + - name: 'STORAGE' + interface: 'ens4f0' + - name: 'TENANT' + interface: 'ens4f0' +internal_vip: '10.20.7.12' +public_vip: '10.20.7.12' diff --git a/deploy/config/vm_environment/zte-virtual1/deploy.yml b/deploy/config/vm_environment/zte-virtual1/deploy.yml index b0949476..1bf254f5 100644 --- a/deploy/config/vm_environment/zte-virtual1/deploy.yml +++ b/deploy/config/vm_environment/zte-virtual1/deploy.yml @@ -1,12 +1,13 @@ -hosts: -- name: 'all_in_one' - roles: - - 'CONTROLLER_LB' - - 'COMPUTER' -disks: - daisy: 50 - controller: 50 - compute: 50 -daisy_passwd: 'r00tme' -daisy_ip: '10.20.11.2' -daisy_gateway: '10.20.11.1' +hosts: +- name: 'all_in_one' + roles: + - 'CONTROLLER_LB' + - 'COMPUTER' +disks: + daisy: 50 + controller: 50 + compute: 50 +daisy_passwd: 'r00tme' +daisy_ip: '10.20.11.2' +daisy_gateway: '10.20.11.1' +deploy_env: 'virtual' \ No newline at end of file diff --git a/deploy/config/vm_environment/zte-virtual1/network.yml b/deploy/config/vm_environment/zte-virtual1/network.yml index 36863882..7d746be6 100644 --- a/deploy/config/vm_environment/zte-virtual1/network.yml +++ b/deploy/config/vm_environment/zte-virtual1/network.yml @@ -1,59 +1,59 @@ -############################################################################## -# Copyright (c) 2016 ZTE Coreporation and others. -# hu.zhijiang@zte.com.cn -# sun.jing22@zte.com.cn -# 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 -############################################################################## - -network-config-metadata: - title: 'zte-virtual1 network config' - version: '0.1' - created: 'Mon Oct 31 2016' - comment: -networks: - - cidr: '10.20.11.0/24' - gateway: '10.20.11.1' - ip_ranges: - - 'start': '10.20.11.3' - 'end': '10.20.11.10' - name: 'MANAGEMENT' - - cidr: '10.20.11.0/24' - gateway: '10.20.11.1' - ip_ranges: - - start: '10.20.11.3' - end: '10.20.11.10' - name: 'STORAGE' - - cidr: '172.10.101.0/24' - gateway: '172.10.101.0' - ip_ranges: - - 'start': '172.10.101.1' - 'end': '172.10.101.10' - 'name': 'EXTERNAL' - - cidr: '10.20.11.0/24' - gateway: '10.20.11.1' - ip_ranges: - - 'start': '10.20.11.3' - 'end': '10.20.11.10' - name: 'PUBLICAPI' - - cidr: '10.20.11.0/24' - gateway: '10.20.11.1' - ip_ranges: - - 'start': '10.20.11.3' - 'end': '10.20.11.10' - name: 'TENANT' -interfaces: - - name: 'EXTERNAL' - interface: 'ens8' - - name: 'MANAGEMENT' - interface: 'ens3' - - name: 'PUBLICAPI' - interface: 'ens3' - - name: 'STORAGE' - interface: 'ens3' - - name: 'TENANT' - interface: 'ens3' -internal_vip: '10.20.11.11' -public_vip: '10.20.11.11' +############################################################################## +# Copyright (c) 2016 ZTE Coreporation and others. +# hu.zhijiang@zte.com.cn +# sun.jing22@zte.com.cn +# 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 +############################################################################## + +network-config-metadata: + title: 'zte-virtual1 network config' + version: '0.1' + created: 'Mon Oct 31 2016' + comment: +networks: + - cidr: '10.20.11.0/24' + gateway: '10.20.11.1' + ip_ranges: + - 'start': '10.20.11.3' + 'end': '10.20.11.10' + name: 'MANAGEMENT' + - cidr: '10.20.11.0/24' + gateway: '10.20.11.1' + ip_ranges: + - start: '10.20.11.3' + end: '10.20.11.10' + name: 'STORAGE' + - cidr: '172.10.101.0/24' + gateway: '172.10.101.0' + ip_ranges: + - 'start': '172.10.101.1' + 'end': '172.10.101.10' + 'name': 'EXTERNAL' + - cidr: '10.20.11.0/24' + gateway: '10.20.11.1' + ip_ranges: + - 'start': '10.20.11.3' + 'end': '10.20.11.10' + name: 'PUBLICAPI' + - cidr: '10.20.11.0/24' + gateway: '10.20.11.1' + ip_ranges: + - 'start': '10.20.11.3' + 'end': '10.20.11.10' + name: 'TENANT' +interfaces: + - name: 'EXTERNAL' + interface: 'ens8' + - name: 'MANAGEMENT' + interface: 'ens3' + - name: 'PUBLICAPI' + interface: 'ens3' + - name: 'STORAGE' + interface: 'ens3' + - name: 'TENANT' + interface: 'ens3' +internal_vip: '10.20.11.11' +public_vip: '10.20.11.11' -- cgit 1.2.3-korg