aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormeimei <meimei@huawei.com>2016-01-26 10:16:23 +0800
committerJustin chi <chigang@huawei.com>2016-02-04 03:15:01 +0000
commit6e3066785dbcfc37b6c4cb82eb7ba594e8116cf5 (patch)
tree3baea594bf9d0dcf75ca050a4e2c63a6fd29514b
parentb8b15a435e82fde83b5fb7ce1e6433f1d7662518 (diff)
[compass] remove redundant files
Change-Id: Ic2b27abb47e217c10ee763d72a178b46ed64c1f4 Signed-off-by: meimei <meimei@huawei.com>
-rw-r--r--deploy/conf/baremetal_cluster.yml37
-rw-r--r--deploy/conf/baremetal_cluster_sh.yml44
-rw-r--r--deploy/conf/baremetal_five.yml45
-rw-r--r--deploy/conf/five.conf8
-rw-r--r--deploy/conf/hardware_environment/huawei_us_lab/pod1/dha.yml39
-rw-r--r--deploy/conf/hardware_environment/huawei_us_lab/pod1/network.yml90
-rw-r--r--deploy/conf/virtual_cluster.yml32
-rw-r--r--deploy/conf/virtual_cluster_odl.yml29
-rw-r--r--deploy/conf/virtual_cluster_onos.yml29
-rw-r--r--deploy/conf/virtual_cluster_opencontrail.yml25
-rw-r--r--deploy/conf/virtual_five.yml29
-rw-r--r--deploy/conf/vm_environment/nosdn.yml32
-rw-r--r--deploy/conf/vm_environment/odl.yml29
-rw-r--r--deploy/conf/vm_environment/onos.yml29
14 files changed, 0 insertions, 497 deletions
diff --git a/deploy/conf/baremetal_cluster.yml b/deploy/conf/baremetal_cluster.yml
deleted file mode 100644
index 798099a..0000000
--- a/deploy/conf/baremetal_cluster.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-TYPE: baremetal
-FLAVOR: cluster
-POWER_TOOL: smmset
-
-hosts:
- - name: host1
- mac: '64:3e:8c:4c:6d:a3'
- location: 14
- roles:
- - controller
- - ha
-
- - name: host2
- mac: '64:3e:8c:4c:6d:37'
- location: 15
- roles:
- - controller
- - ha
-
- - name: host3
- mac: '64:3e:8c:4c:6c:d7'
- location: 16
- roles:
- - controller
- - ha
-
- - name: host4
- mac: '64:3e:8c:4c:6b:7b'
- location: 17
- roles:
- - compute
-
- - name: host5
- location: 18
- mac: '64:3e:8c:4c:68:2b'
- roles:
- - compute
diff --git a/deploy/conf/baremetal_cluster_sh.yml b/deploy/conf/baremetal_cluster_sh.yml
deleted file mode 100644
index fe32954..0000000
--- a/deploy/conf/baremetal_cluster_sh.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-TYPE: baremetal
-FLAVOR: cluster
-POWER_TOOL: ipmitool
-
-ipmiUser: root
-ipmiPass: Huawei@123
-ipmiVer: '1.0'
-
-hosts:
- - name: host1
- mac: 'D8:49:0B:DA:2A:28'
- ipmiUser: root
- ipmiPass: Huawei@123
- ipmiIp: 192.168.2.145
- roles:
- - controller
- - ha
-
- - name: host2
- mac: 'D8:49:0B:DA:5B:5D'
- ipmiIp: 192.168.2.155
- roles:
- - controller
- - ha
-
- - name: host3
- mac: 'D8:49:0B:DA:5A:B7'
- ipmiIp: 192.168.2.165
- roles:
- - controller
- - ha
-
- - name: host4
- mac: 'D8:49:0B:DA:58:99'
- ipmiIp: 192.168.2.175
- roles:
- - compute
-
- - name: host5
- mac: 'D8:49:0B:DA:56:85'
- ipmiIp: 192.168.2.185
- roles:
- - compute
diff --git a/deploy/conf/baremetal_five.yml b/deploy/conf/baremetal_five.yml
deleted file mode 100644
index 6e46e3b..0000000
--- a/deploy/conf/baremetal_five.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-TYPE: baremetal
-FLAVOR: five
-POWER_TOOL: ipmitool
-
-ipmiUser: root
-ipmiPass: Huawei@123
-
-hosts:
- - name: host1
- mac: '11:22:33:44:55'
- ipmiUser: root
- ipmiPass: Huawei@123
- ipmiIp: 192.168.2.100
- roles:
- - controller
- - network
-
- - name: host2
- mac: '11:22:33:44:55'
- ipmiIp: 192.168.2.100
- roles:
- - compute
- - storage
-
- - name: host3
- mac: '11:22:33:44:55'
- ipmiIp: 192.168.2.100
- roles:
- - compute
- - storage
-
- - name: host4
- mac: '11:22:33:44:55'
- ipmiIp: 192.168.2.100
- roles:
- - compute
- - storage
-
- - name: host5
- mac: '11:22:33:44:55'
- ipmiIp: 192.168.2.100
- roles:
- - compute
- - storage
diff --git a/deploy/conf/five.conf b/deploy/conf/five.conf
deleted file mode 100644
index beff1c5..0000000
--- a/deploy/conf/five.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-export ADAPTER_OS_PATTERN='(?i)ubuntu-14\.04\.3.*'
-#export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*1503-01.*'}
-export REPO_NAME=${REPO_NAME:-"trusty-juno-ppa"}
-#export REPO_NAME=${REPO_NAME:-"centos7-juno-ppa"}
-export ADAPTER_NAME="openstack_juno"
-export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
-export ADAPTER_FLAVOR_PATTERN="single-controller"
-export DEFAULT_ROLES=""
diff --git a/deploy/conf/hardware_environment/huawei_us_lab/pod1/dha.yml b/deploy/conf/hardware_environment/huawei_us_lab/pod1/dha.yml
deleted file mode 100644
index 47df7ff..0000000
--- a/deploy/conf/hardware_environment/huawei_us_lab/pod1/dha.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-TYPE: baremetal
-FLAVOR: cluster
-POWER_TOOL: ipmitool
-
-ipmiUser: root
-ipmiVer: '2.0'
-
-hosts:
- - name: host2
- mac: 'E0:24:7F:02:15:A3'
- ipmiIp: 172.16.130.28
- ipmiPass: huawei@123
- roles:
- - controller
- - ha
-
- - name: host3
- mac: 'D8:49:0B:DA:2A:28'
- ipmiIp: 172.16.130.29
- ipmiPass: Huawei@123
- roles:
- - controller
- - ha
-
- - name: host4
- mac: 'D8:49:0B:DA:5B:5D'
- ipmiIp: 172.16.130.30
- ipmiPass: Huawei@123
- roles:
- - compute
-
- - name: host5
- mac: 'D8:49:0B:DA:56:85'
- ipmiIp: 172.16.130.31
- ipmiPass: Huawei@123
- roles:
- - compute
-
diff --git a/deploy/conf/hardware_environment/huawei_us_lab/pod1/network.yml b/deploy/conf/hardware_environment/huawei_us_lab/pod1/network.yml
deleted file mode 100644
index 154f415..0000000
--- a/deploy/conf/hardware_environment/huawei_us_lab/pod1/network.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-nic_mappings: []
-bond_mappings: []
-
-provider_net_mappings:
- - name: br-prv
- network: physnet
- interface: eth1
- type: ovs
- role:
- - controller
- - compute
-
-sys_intf_mappings:
- - name: mgmt
- interface: eth1
- vlan_tag: 101
- type: vlan
- role:
- - controller
- - compute
-
- - name: storage
- interface: eth1
- vlan_tag: 102
- type: vlan
- role:
- - controller
- - compute
-
- - name: external
- interface: br-prv
- type: ovs
- role:
- - controller
- - compute
-
-ip_settings:
- - name: mgmt
- ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
- cidr: "172.16.1.0/24"
- role:
- - controller
- - compute
-
- - name: storage
- ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
- cidr: "172.16.2.0/24"
- role:
- - controller
- - compute
-
- - name: external
- ip_ranges:
- - - "192.168.10.10"
- - "192.168.10.50"
- cidr: "192.168.10.0/24"
- gw: "192.168.10.1"
- role:
- - controller
- - compute
-
-internal_vip:
- ip: 172.16.1.222
- netmask: "24"
- interface: mgmt
-
-public_vip:
- ip: 192.168.10.51
- netmask: "24"
- interface: external
-
-onos_nic: eth2
-public_net_info:
- enable: True
- network: ext-net
- type: flat
- segment_id: 10
- subnet: ext-subnet
- provider_network: physnet
- router: router-ext
- enable_dhcp: False
- no_gateway: False
- external_gw: "192.168.10.1"
- floating_ip_cidr: "192.168.10.0/24"
- floating_ip_start: "192.168.10.100"
- floating_ip_end: "192.168.10.200"
diff --git a/deploy/conf/virtual_cluster.yml b/deploy/conf/virtual_cluster.yml
deleted file mode 100644
index aa2a1b3..0000000
--- a/deploy/conf/virtual_cluster.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-TYPE: virtual
-FLAVOR: cluster
-
-hosts:
- - name: host1
- roles:
- - controller
- - ha
- - ceph-adm
- - ceph-mon
-
- - name: host2
- roles:
- - controller
- - ha
- - ceph-mon
-
- - name: host3
- roles:
- - controller
- - ha
- - ceph-mon
-
- - name: host4
- roles:
- - compute
- - ceph-osd
-
- - name: host5
- roles:
- - compute
- - ceph-osd
diff --git a/deploy/conf/virtual_cluster_odl.yml b/deploy/conf/virtual_cluster_odl.yml
deleted file mode 100644
index e2ee19c..0000000
--- a/deploy/conf/virtual_cluster_odl.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-TYPE: virtual
-FLAVOR: cluster
-
-hosts:
- - name: host1
- roles:
- - controller
- - ha
- - odl
-
- - name: host2
- roles:
- - controller
- - ha
- - odl
-
- - name: host3
- roles:
- - controller
- - ha
- - odl
-
- - name: host4
- roles:
- - compute
-
- - name: host5
- roles:
- - compute
diff --git a/deploy/conf/virtual_cluster_onos.yml b/deploy/conf/virtual_cluster_onos.yml
deleted file mode 100644
index fcd07ef..0000000
--- a/deploy/conf/virtual_cluster_onos.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-TYPE: virtual
-FLAVOR: cluster
-
-hosts:
- - name: host1
- roles:
- - controller
- - ha
- - onos
-
- - name: host2
- roles:
- - controller
- - ha
- - onos
-
- - name: host3
- roles:
- - controller
- - ha
- - onos
-
- - name: host4
- roles:
- - compute
-
- - name: host5
- roles:
- - compute
diff --git a/deploy/conf/virtual_cluster_opencontrail.yml b/deploy/conf/virtual_cluster_opencontrail.yml
deleted file mode 100644
index 56240f3..0000000
--- a/deploy/conf/virtual_cluster_opencontrail.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-TYPE: virtual
-FLAVOR: cluster
-
-hosts:
- - name: host1
- roles:
- - controller
- - ha
- - opencontrail
-
- - name: host2
- roles:
- - compute
-
- - name: host3
- roles:
- - compute
-
- - name: host4
- roles:
- - compute
-
- - name: host5
- roles:
- - compute
diff --git a/deploy/conf/virtual_five.yml b/deploy/conf/virtual_five.yml
deleted file mode 100644
index f42f3d6..0000000
--- a/deploy/conf/virtual_five.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-TYPE: virtual
-FLAVOR: five
-
-hosts:
- - name: host1
- roles:
- - controller
- - network
-
- - name: host2
- roles:
- - compute
- - storage
-
- - name: host3
- roles:
- - compute
- - storage
-
- - name: host4
- roles:
- - compute
- - storage
-
- - name: host5
- roles:
- - compute
- - storage
-
diff --git a/deploy/conf/vm_environment/nosdn.yml b/deploy/conf/vm_environment/nosdn.yml
deleted file mode 100644
index aa2a1b3..0000000
--- a/deploy/conf/vm_environment/nosdn.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-TYPE: virtual
-FLAVOR: cluster
-
-hosts:
- - name: host1
- roles:
- - controller
- - ha
- - ceph-adm
- - ceph-mon
-
- - name: host2
- roles:
- - controller
- - ha
- - ceph-mon
-
- - name: host3
- roles:
- - controller
- - ha
- - ceph-mon
-
- - name: host4
- roles:
- - compute
- - ceph-osd
-
- - name: host5
- roles:
- - compute
- - ceph-osd
diff --git a/deploy/conf/vm_environment/odl.yml b/deploy/conf/vm_environment/odl.yml
deleted file mode 100644
index e2ee19c..0000000
--- a/deploy/conf/vm_environment/odl.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-TYPE: virtual
-FLAVOR: cluster
-
-hosts:
- - name: host1
- roles:
- - controller
- - ha
- - odl
-
- - name: host2
- roles:
- - controller
- - ha
- - odl
-
- - name: host3
- roles:
- - controller
- - ha
- - odl
-
- - name: host4
- roles:
- - compute
-
- - name: host5
- roles:
- - compute
diff --git a/deploy/conf/vm_environment/onos.yml b/deploy/conf/vm_environment/onos.yml
deleted file mode 100644
index fcd07ef..0000000
--- a/deploy/conf/vm_environment/onos.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-TYPE: virtual
-FLAVOR: cluster
-
-hosts:
- - name: host1
- roles:
- - controller
- - ha
- - onos
-
- - name: host2
- roles:
- - controller
- - ha
- - onos
-
- - name: host3
- roles:
- - controller
- - ha
- - onos
-
- - name: host4
- roles:
- - compute
-
- - name: host5
- roles:
- - compute