summaryrefslogtreecommitdiffstats
path: root/deploy/conf
diff options
context:
space:
mode:
Diffstat (limited to 'deploy/conf')
-rw-r--r--deploy/conf/baremetal.conf18
-rw-r--r--deploy/conf/baremetal_cluster.yml37
-rw-r--r--deploy/conf/baremetal_five.yml45
-rw-r--r--deploy/conf/base.conf17
-rw-r--r--deploy/conf/cluster.conf17
-rw-r--r--deploy/conf/five.conf17
-rw-r--r--deploy/conf/network_cfg.yaml53
-rw-r--r--deploy/conf/neutron_cfg.yaml6
-rw-r--r--deploy/conf/virtual.conf9
-rw-r--r--deploy/conf/virtual_cluster.yml26
-rw-r--r--deploy/conf/virtual_five.yml29
11 files changed, 216 insertions, 58 deletions
diff --git a/deploy/conf/baremetal.conf b/deploy/conf/baremetal.conf
index a97f2b99..5d42b36d 100644
--- a/deploy/conf/baremetal.conf
+++ b/deploy/conf/baremetal.conf
@@ -1,20 +1,4 @@
-export VIRT_CPUS=4
-export HOST_MACS="'64:3e:8c:4c:6d:a3' '64:3e:8c:4c:6d:37' '64:3e:8c:4c:6c:d7' '64:3e:8c:4c:6b:7b' '64:3e:8c:4c:68:2b'"
-export VIRT_MEM=16384
-export VIRT_DISK=30G
-export 'ADAPTER_OS_PATTERN=(?i)ubuntu-14\.04.*'
-#export 'ADAPTER_OS_PATTERN=(?i)centos-7\.1.*'
-export ADAPTER_NAME="openstack_juno"
-export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
-export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes"
-export HOSTNAMES="host1,host2,host3,host4,host5"
-export HOST_ROLES="host1=controller,ha;host2=controller,ha;host3=controller,ha;host4=compute;host5=compute"
-export DEFAULT_ROLES=""
export SWITCH_IPS="192.168.124.2"
export SWITCH_CREDENTIAL="version=2c,community=public"
-export DEPLOYMENT_TIMEOUT="90"
+export DEPLOYMENT_TIMEOUT="150"
export POLL_SWITCHES_FLAG="nopoll_switches"
-export DASHBOARD_URL=""
-export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-source ${REGTEST_DIR}/base.conf
-export VIP="10.1.0.222"
diff --git a/deploy/conf/baremetal_cluster.yml b/deploy/conf/baremetal_cluster.yml
new file mode 100644
index 00000000..798099a4
--- /dev/null
+++ b/deploy/conf/baremetal_cluster.yml
@@ -0,0 +1,37 @@
+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_five.yml b/deploy/conf/baremetal_five.yml
new file mode 100644
index 00000000..6e46e3b2
--- /dev/null
+++ b/deploy/conf/baremetal_five.yml
@@ -0,0 +1,45 @@
+
+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/base.conf b/deploy/conf/base.conf
index be346ddf..4455cc43 100644
--- a/deploy/conf/base.conf
+++ b/deploy/conf/base.conf
@@ -1,4 +1,4 @@
-export ISO_URL=http://192.168.127.11:9999/xh/work/build/work/compass.iso
+export ISO_URL=${ISO_URL:-http://58.251.166.184:9999/compass.iso}
export INSTALL_IP=${INSTALL_IP:-10.1.0.12}
export INSTALL_MASK=${INSTALL_MASK:-255.255.255.0}
export INSTALL_GW=${INSTALL_GW:-10.1.0.1}
@@ -26,15 +26,10 @@ export NAMESERVERS="$COMPASS_SERVER"
export DOMAIN="ods.com"
export PARTITIONS="/=70%,/home=5%,/tmp=5%,/var=20%"
export SUBNETS="10.1.0.0/24,172.16.2.0/24,172.16.3.0/24,172.16.4.0/24"
+
export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-'10.1.0.50'}
-export TENANT_IP_START=${TENANT_IP_START:-'172.16.2.50'}
-export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.50'}
-export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.50'}
export MANAGEMENT_INTERFACE=${MANAGEMENT_INTERFACE:-eth0}
-export TENANT_INTERFACE=${TENANT_INTERFACE:-eth1}
-export STORAGE_INTERFACE=${STORAGE_INTERFACE:-eth3}
-export PUBLIC_INTERFACE=${PUBLIC_INTERFACE:-eth2}
-
+export DASHBOARD_URL=""
function next_ip {
ip_addr=$1
@@ -52,9 +47,9 @@ if [ -z "$HOST_NETWORKS" ]; then
STORAGE_IP=${STORAGE_IP_START}
for HOSTNAME in ${HOSTNAME_LIST[@]}; do
if [ -z "$HOST_NETWORKS" ]; then
- HOST_NETWORKS="${HOSTNAME}:${MANAGEMENT_INTERFACE}=${MANAGE_IP}|is_mgmt,${TENANT_INTERFACE}=${TENANT_IP},${PUBLIC_INTERFACE}=${PUBLIC_IP}|is_promiscuous,${STORAGE_INTERFACE}=${STORAGE_IP}"
+ HOST_NETWORKS="${HOSTNAME}:${MANAGEMENT_INTERFACE}=${MANAGE_IP}|is_mgmt"
else
- HOST_NETWORKS="${HOST_NETWORKS};${HOSTNAME}:${MANAGEMENT_INTERFACE}=${MANAGE_IP}|is_mgmt,${TENANT_INTERFACE}=${TENANT_IP},${PUBLIC_INTERFACE}=${PUBLIC_IP}|is_promiscuous,${STORAGE_INTERFACE}=${STORAGE_IP}"
+ HOST_NETWORKS="${HOST_NETWORKS};${HOSTNAME}:${MANAGEMENT_INTERFACE}=${MANAGE_IP}|is_mgmt"
fi
MANAGE_IP=$(next_ip ${MANAGE_IP})
TENANT_IP=$(next_ip ${TENANT_IP})
@@ -64,7 +59,7 @@ if [ -z "$HOST_NETWORKS" ]; then
export HOST_NETWORKS
fi
-export NETWORK_MAPPING=${NETWORK_MAPPING:-"management=${MANAGEMENT_INTERFACE},tenant=${TENANT_INTERFACE},storage=${STORAGE_INTERFACE},external=${PUBLIC_INTERFACE}"}
+export NETWORK_MAPPING=${NETWORK_MAPPING:-"install=${MANAGEMENT_INTERFACE}"}
export PROXY=""
export IGNORE_PROXY=""
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index ef1f5701..72602ea0 100644
--- a/deploy/conf/cluster.conf
+++ b/deploy/conf/cluster.conf
@@ -1,20 +1,7 @@
-export VIRT_NUMBER=5
-export VIRT_CPUS=4
-export VIRT_MEM=16384
-export VIRT_DISK=30G
-export 'ADAPTER_OS_PATTERN=(?i)ubuntu-14\.04.*'
-#export 'ADAPTER_OS_PATTERN=(?i)centos-7\.1.*'
+export ADAPTER_OS_PATTERN='(?i)ubuntu-14\.04\.3.*'
+#export ADAPTER_OS_PATTERN='(?i)centos-7\.1.*'
export ADAPTER_NAME="openstack_juno"
export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes"
-export HOSTNAMES="host1,host2,host3,host4,host5"
-export HOST_ROLES="host1=controller,ha;host2=controller,ha;host3=controller,ha;host4=compute;host5=compute"
export DEFAULT_ROLES=""
-export SWITCH_IPS="1.1.1.1"
-export SWITCH_CREDENTIAL="version=2c,community=public"
-export DEPLOYMENT_TIMEOUT="60"
-export POLL_SWITCHES_FLAG="nopoll_switches"
-export DASHBOARD_URL=""
-export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-source ${REGTEST_DIR}/base.conf
export VIP="10.1.0.222"
diff --git a/deploy/conf/five.conf b/deploy/conf/five.conf
index a40d68e9..32181b58 100644
--- a/deploy/conf/five.conf
+++ b/deploy/conf/five.conf
@@ -1,19 +1,6 @@
-export VIRT_NUMBER=5
-export VIRT_CPUS=4
-export VIRT_MEM=16384
-export VIRT_DISK=30G
-export 'ADAPTER_OS_PATTERN=(?i)ubuntu-14\.04.*'
-#export 'ADAPTER_OS_PATTERN=(?i)centos-7\.1.*'
+export ADAPTER_OS_PATTERN='(?i)ubuntu-14\.04\.3.*'
+#export ADAPTER_OS_PATTERN='(?i)centos-7\.1.*'
export ADAPTER_NAME="openstack_juno"
export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
export ADAPTER_FLAVOR_PATTERN="single-controller"
-export HOSTNAMES="host1,host2,host3,host4,host5"
-export HOST_ROLES="host1=controller,network;host2=compute,storage;host3=compute,storage;host4=compute,storage;host5=compute,storage"
export DEFAULT_ROLES=""
-export SWITCH_IPS="1.1.1.1"
-export SWITCH_CREDENTIAL="version=2c,community=public"
-export DEPLOYMENT_TIMEOUT="60"
-export POLL_SWITCHES_FLAG="nopoll_switches"
-export DASHBOARD_URL=""
-export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-source ${REGTEST_DIR}/base.conf
diff --git a/deploy/conf/network_cfg.yaml b/deploy/conf/network_cfg.yaml
new file mode 100644
index 00000000..73d05ac2
--- /dev/null
+++ b/deploy/conf/network_cfg.yaml
@@ -0,0 +1,53 @@
+nic_mappings: []
+bond_mappings: []
+
+provider_net_mappings:
+ - name: br-prv
+ network: physnet
+ interface: eth1
+ type: ovs
+
+sys_intf_mappings:
+ - name: mgmt
+ interface: eth1
+ vlan_tag: 2
+ - name: storage
+ interface: eth1
+ vlan_tag: 3
+ - name: external
+ interface: br-prv
+ vlan_tag: 4
+
+ip_settings:
+ - name: mgmt
+ ip_ranges:
+ - - "172.16.1.1"
+ - "172.16.1.254"
+ cidr: "172.16.1.0/24"
+
+ - name: storage
+ ip_ranges:
+ - - "172.16.2.1"
+ - "172.16.2.254"
+ cidr: "172.16.2.0/24"
+
+ - name: external
+ ip_ranges:
+ - - "172.16.3.2"
+ - "172.16.3.100"
+ cidr: "172.16.3.0/24"
+ gw: "172.16.3.1"
+
+public_net_info:
+ network: ext-net
+ type: vlan
+ segment_id: 1000
+ subnet: ext-subnet
+ provider_network: physnet
+ router: router-ext
+ enable_dhcp: False
+ no_gateway: False
+ external_gw: "172.16.3.1"
+ floating_ip_cidr: "172.16.3.0/24"
+ floating_ip_start: "172.16.3.100"
+ floating_ip_end: "172.16.3.254"
diff --git a/deploy/conf/neutron_cfg.yaml b/deploy/conf/neutron_cfg.yaml
new file mode 100644
index 00000000..ce6e1920
--- /dev/null
+++ b/deploy/conf/neutron_cfg.yaml
@@ -0,0 +1,6 @@
+openvswitch:
+ tenant_network_type: vxlan
+ network_vlan_ranges:
+ - 'physnet:1:4094'
+ bridge_mappings:
+ - 'physnet:br-prv'
diff --git a/deploy/conf/virtual.conf b/deploy/conf/virtual.conf
new file mode 100644
index 00000000..0dbdb28b
--- /dev/null
+++ b/deploy/conf/virtual.conf
@@ -0,0 +1,9 @@
+export VIRT_NUMBER=5
+export VIRT_CPUS=4
+export VIRT_MEM=16384
+export VIRT_DISK=30G
+
+export SWITCH_IPS="1.1.1.1"
+export SWITCH_CREDENTIAL="version=2c,community=public"
+export DEPLOYMENT_TIMEOUT="150"
+export POLL_SWITCHES_FLAG="nopoll_switches"
diff --git a/deploy/conf/virtual_cluster.yml b/deploy/conf/virtual_cluster.yml
new file mode 100644
index 00000000..b3bd9e77
--- /dev/null
+++ b/deploy/conf/virtual_cluster.yml
@@ -0,0 +1,26 @@
+TYPE: virtual
+FLAVOR: cluster
+
+hosts:
+ - name: host1
+ roles:
+ - controller
+ - ha
+
+ - name: host2
+ roles:
+ - controller
+ - ha
+
+ - name: host3
+ roles:
+ - controller
+ - ha
+
+ - name: host4
+ roles:
+ - compute
+
+ - name: host5
+ roles:
+ - compute
diff --git a/deploy/conf/virtual_five.yml b/deploy/conf/virtual_five.yml
new file mode 100644
index 00000000..f42f3d62
--- /dev/null
+++ b/deploy/conf/virtual_five.yml
@@ -0,0 +1,29 @@
+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
+