From 6413d34aa7ebbd8b547636c8a8f41b895591b4e2 Mon Sep 17 00:00:00 2001 From: xiaodongwang Date: Tue, 23 Sep 2014 11:36:38 -0700 Subject: [PATCH] add ubuntu os only regtest conf Change-Id: Id5e72cad18cc9b864336ecc1febae23aa19e7e36 --- bin/client.py | 7 +++-- .../cobbler/CentOS-6.5-x86_64/system.tmpl | 2 +- .../cobbler/Ubuntu-12.04-x86_64/system.tmpl | 4 +-- install/compass.sh | 29 +++++++++++-------- misc/ci/pxe-deploy.sh | 1 + regtest/regtest.conf | 10 +++---- regtest/regtest.sh | 4 +++ regtest/regtest10.conf | 17 +++++++++++ regtest/regtest2.conf | 12 ++++++-- regtest/regtest3.conf | 11 +++++-- regtest/regtest4.conf | 14 +++++---- regtest/regtest5.conf | 13 +++++---- regtest/regtest6.conf | 12 ++++++-- regtest/regtest7.conf | 13 +++++++++ regtest/regtest8.conf | 13 +++++++++ regtest/regtest9.conf | 17 +++++++++++ 16 files changed, 136 insertions(+), 43 deletions(-) create mode 100644 regtest/regtest10.conf create mode 100644 regtest/regtest7.conf create mode 100644 regtest/regtest8.conf create mode 100644 regtest/regtest9.conf diff --git a/bin/client.py b/bin/client.py index 3c08a1fb..693e1fc5 100755 --- a/bin/client.py +++ b/bin/client.py @@ -465,9 +465,10 @@ def _add_cluster(client, adapter_id, os_id, flavor_id, machines): role_mapping = {} for role in roles: if role.get('optional', False): - role_mapping[role['name']] = 1 - else: role_mapping[role['name']] = 0 + else: + role_mapping[role['name']] = 1 + logging.info('cluster %s role mapping: %s', cluster_id, role_mapping) hostnames = [ hostname for hostname in flags.OPTIONS.hostnames.split(',') @@ -779,7 +780,7 @@ def _set_hosts_roles(client, cluster_id, host_mapping, role_mapping): unassigned_roles = [] for role, count in role_mapping.items(): if count > 0: - unassigned_roles.apend(role) + unassigned_roles.append(role) if len(unassigned_hostnames) < len(unassigned_roles): raise Exception( 'there is no enough hosts %s to assign roles %s' % ( diff --git a/conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl b/conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl index 2f0648c3..6114e47d 100644 --- a/conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl +++ b/conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl @@ -59,6 +59,6 @@ "ntp_server": "$ntp_server", "timezone": "$timezone", "ignore_proxy": "$no_proxy", - "local_repo": "$local_repo" + "local_repo": "$getVar('local_repo', '')" } } diff --git a/conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl b/conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl index 95fbaa0b..6114e47d 100644 --- a/conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl +++ b/conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl @@ -58,7 +58,7 @@ "https_proxy": "$getVar('https_proxy', '')", "ntp_server": "$ntp_server", "timezone": "$timezone", - "ignore_proxy": "$no_proxy" - "local_repo": "$local_repo" + "ignore_proxy": "$no_proxy", + "local_repo": "$getVar('local_repo', '')" } } diff --git a/install/compass.sh b/install/compass.sh index 55b14194..132523f2 100755 --- a/install/compass.sh +++ b/install/compass.sh @@ -1,11 +1,12 @@ #!/bin/bash # Move files to their respective locations -mkdir -p /etc/compass -mkdir -p /opt/compass/bin -mkdir -p /var/www/compass_web -mkdir -p /var/log/compass -mkdir -p /opt/compass/db -mkdir -p /var/www/compass +sudo mkdir -p /etc/compass +sudo mkdir -p /opt/compass/bin +sudo mkdir -p /var/www/compass_web +sudo mkdir -p /var/log/compass +sudo mkdir -p /var/log/chef +sudo mkdir -p /opt/compass/db +sudo mkdir -p /var/www/compass sudo cp -rf $COMPASSDIR/misc/apache/ods-server.conf /etc/httpd/conf.d/ods-server.conf sudo cp -rf $COMPASSDIR/misc/apache/compass.wsgi /var/www/compass/compass.wsgi @@ -32,6 +33,7 @@ fi sudo chmod -R 777 /opt/compass/db sudo chmod -R 777 /var/log/compass +sudo chmod -R 777 /var/log/chef sudo echo "export C_FORCE_ROOT=1" > /etc/profile.d/celery_env.sh sudo chmod +x /etc/profile.d/celery_env.sh cd $COMPASSDIR @@ -129,12 +131,12 @@ else echo "httpd has already started" fi -mkdir -p /var/log/redis -chown -R redis:root /var/log/redis -mkdir -p /var/lib/redis/ -chown -R redis:root /var/lib/redis -mkdir -p /var/run/redis -chown -R redis:root /var/run/redis +sudo mkdir -p /var/log/redis +sudo chown -R redis:root /var/log/redis +sudo mkdir -p /var/lib/redis/ +sudo chown -R redis:root /var/lib/redis +sudo mkdir -p /var/run/redis +sudo chown -R redis:root /var/run/redis sudo service redis status |grep running if [[ "$?" != "0" ]]; then @@ -150,6 +152,9 @@ if [[ "$?" != "0" ]]; then exit 1 fi +killall -9 celeryd +killall -9 celery +service compass-celeryd restart service compass-celeryd status |grep running if [[ "$?" != "0" ]]; then echo "compass-celeryd is not started" diff --git a/misc/ci/pxe-deploy.sh b/misc/ci/pxe-deploy.sh index af197dd1..545c95a8 100755 --- a/misc/ci/pxe-deploy.sh +++ b/misc/ci/pxe-deploy.sh @@ -1,6 +1,7 @@ #!/bin/bash -xe ln -s /var/log/cobbler/anamon cobbler_logs ln -s /var/log/compass compass_logs +ln -s /var/log/chef chef_logs cp compass-core/compass/apiclient/example.py /tmp/test.py chmod +x /tmp/test.py virsh destroy pxe01 diff --git a/regtest/regtest.conf b/regtest/regtest.conf index bfab80fc..ea807cf9 100644 --- a/regtest/regtest.conf +++ b/regtest/regtest.conf @@ -8,7 +8,7 @@ export CLEAN_OLD_DATA=${CLEAN_OLD_DATA:-true} export COMPASS_SERVER_URL=${COMPASS_SERVER_URL:-"http://$ipaddr/api"} export COMPASS_USER_EMAIL=${COMPASS_USER_EMAIL:-'admin@huawei.com'} export COMPASS_USER_PASSWORD=${COMPASS_USER_PASSWORD:-'admin'} -export CLUSTER_NAME=${CLUSTER_NAME:-'test_cluster'} +export CLUSTER_NAME=${CLUSTER_NAME:-'allinone'} export SWITCH_IPS=${SWITCH_IPS:-'10.145.81.219'} export SWITCH_VERSION=${SWITCH_VERSION:-'2c'} export SWITCH_COMMUNITY=${SWITCH_COMMUNITY:-'public'} @@ -79,9 +79,9 @@ export CONSOLE_VOLUME_CREDENTIAL=${CONSOLE_VOLUME_CREDENTIAL:-"volume:${CONSOLE_ export CONSOLE_CREDENTIALS=${CONSOLE_CREDENTIALS:-"${CONSOLE_ADMIN_CREDENTIAL},${CONSOLE_COMPUTE_CREDENTIAL},${CONSOLE_DASHBOARD_CREDENTIAL},${CONSOLE_IMAGE_CREDENTIAL},${CONSOLE_METERING_CREDENTIAL},${CONSOLE_NETWORK_CREDENTIAL},${CONSOLE_OBJECT_STORE_CREDENTIAL},${CONSOLE_VOLUME_CREDENTIAL}"} export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-`echo $ipaddr |cut -d. -f'1 2 3'`.50} -export TENANT_IP_START=${TENANT_IP_START:-'172.16.2.1'} -export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.1'} -export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.1'} +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} @@ -105,7 +105,7 @@ if [ -z "$HOST_NETWORKS" ]; then 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}" else - HOST_NETWORKS="${HOST_NETWORKS};${HOSTNAME}:${MANAGEMENT_INTERFACE}=${MANAGE_IP},${TENANT_INTERFACE}=${TENANT_IP},${PUBLIC_INTERFACE}=${PUBLIC_IP},${STORAGE_INTERFACE}=${STORAGE_IP}" + 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}" fi MANAGE_IP=$(next_ip ${MANAGE_IP}) TENANT_IP=$(next_ip ${TENANT_IP}) diff --git a/regtest/regtest.sh b/regtest/regtest.sh index 1ab8468a..1c7d92f7 100755 --- a/regtest/regtest.sh +++ b/regtest/regtest.sh @@ -116,10 +116,14 @@ fi if [[ ! -L compass_logs ]]; then ln -s /var/log/compass compass_logs fi +if [[ ! -L chef_logs ]]; then + ln -s /var/log/chef chef_logs +fi CLIENT_SCRIPT=/opt/compass/bin/client.py if [[ "$CLEAN_OLD_DATA" == "0" || "$CLEAN_OLD_DATA" == "false" ]]; then echo "keep old deployment data" else + rm -rf /var/log/compass/* /opt/compass/bin/refresh.sh if [[ "$?" != "0" ]]; then echo "failed to refresh" diff --git a/regtest/regtest10.conf b/regtest/regtest10.conf new file mode 100644 index 00000000..39a385ee --- /dev/null +++ b/regtest/regtest10.conf @@ -0,0 +1,17 @@ +# conf to install openstack on centos with multi node flavor +export VIRT_NUM=${VIRT_NUM:-'12'} +export VIRT_CPUS=${VIRT_CPUS:-'2'} +export VIRT_MEM=${VIRT_MEM:-'8192'} +export VIRT_DISK=${VIRT_DISK:-'20G'} +export CLUSTER_NAME=${CLUSTER_NAME:-'multinodes-ubuntu'} +export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu.*'} +export HOSTNAMES=${HOSTNAMES:-'database,messaging,identity,compute-controller,compute-worker1,compute-worker2,network-server,network-worker,block-storage-volume,block-storage-controller,image,dashboard'} +export HOST_ROLES=${HOST_ROLES:-'database=os-ops-database;messaging=os-ops-messaging;identity=os-identity;compute-controller=os-compute-controller;network-server=os-network-server;network-worker=os-network-worker;block-storage-volume=os-block-storage-volume;block-storage-controller=os-block-storage-controller;image=os-image;dashboard=os-dashboard'} +export DEFAULT_ROLES=${DEFAULT_ROLES:-'os-compute-worker'} +export ADAPTER_FLAVOR_PATTERN=${ADAPTER_FLAVOR_PATTERN:-'multinodes'} +export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-`echo $ipaddr |cut -d. -f'1 2 3'`.90} +export TENANT_IP_START=${TENANT_IP_START:-'172.16.2.90'} +export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.90'} +export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.90'} +export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +source ${REGTEST_DIR}/regtest.conf diff --git a/regtest/regtest2.conf b/regtest/regtest2.conf index 8b398325..d98b6cfb 100644 --- a/regtest/regtest2.conf +++ b/regtest/regtest2.conf @@ -3,8 +3,14 @@ export VIRT_NUM=${VIRT_NUM:-'1'} export VIRT_CPUS=${VIRT_CPUS:-'10'} export VIRT_MEM=${VIRT_MEM:-'8192'} export VIRT_DISK=${VIRT_DISK:-'30G'} -export HOSTNAMES=${HOSTNAMES:-'single-contoller-multi-compute'} -export HOST_ROLES=${HOST_ROLES:-'single-contoller-multi-compute=os-controller,os-compute-worker,os-network,os-block-storage-volume'} +export CLUSTER_NAME=${CLUSTER_NAME:-'single-controller'} +export HOSTNAMES=${HOSTNAMES:-'allinone'} +export HOST_ROLES=${HOST_ROLES:-'allinone=os-controller,os-compute-worker,os-network,os-block-storage-volume'} +export DEFAULT_ROLES=${DEFAULT_ROLES:-'os-compute-worker'} export ADAPTER_FLAVOR_PATTERN=${ADAPTER_FLAVOR_PATTERN:-'single-contoller-multi-compute'} -REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-`echo $ipaddr |cut -d. -f'1 2 3'`.52} +export TENANT_IP_START=${TENANT_IP_START:-'172.16.2.52'} +export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.52'} +export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.52'} +export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) source ${REGTEST_DIR}/regtest.conf diff --git a/regtest/regtest3.conf b/regtest/regtest3.conf index 9b3ec3d2..4f8512c8 100644 --- a/regtest/regtest3.conf +++ b/regtest/regtest3.conf @@ -3,9 +3,14 @@ export VIRT_NUM=${VIRT_NUM:-'1'} export VIRT_CPUS=${VIRT_CPUS:-'10'} export VIRT_MEM=${VIRT_MEM:-'8192'} export VIRT_DISK=${VIRT_DISK:-'30G'} -export HOSTNAMES=${HOSTNAMES:-'multinodes'} -export HOST_ROLES=${HOST_ROLES:-'multinodes=os-ops-database,os-ops-messaging,os-identity,os-compute-controller,os-compute-worker,os-network-server,os-network-worker,os-block-storage-volume,os-block-storage-controller,os-image,os-dashboard'} +export CLUSTER_NAME=${CLUSTER_NAME:-'multinodes'} +export HOSTNAMES=${HOSTNAMES:-'allinone'} +export HOST_ROLES=${HOST_ROLES:-'allinone=os-ops-database,os-ops-messaging,os-identity,os-compute-controller,os-compute-worker,os-network-server,os-network-worker,os-block-storage-volume,os-block-storage-controller,os-image,os-dashboard'} export DEFAULT_ROLES=${DEFAULT_ROLES:-'os-compute-worker'} export ADAPTER_FLAVOR_PATTERN=${ADAPTER_FLAVOR_PATTERN:-'multinodes'} -REGTEST_DI=R$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-`echo $ipaddr |cut -d. -f'1 2 3'`.54} +export TENANT_IP_START=${TENANT_IP_START:-'172.16.2.54'} +export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.54'} +export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.54'} +export REGTEST_DI=R$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) source ${REGTEST_DIR}/regtest.conf diff --git a/regtest/regtest4.conf b/regtest/regtest4.conf index 7494781a..46513a0e 100644 --- a/regtest/regtest4.conf +++ b/regtest/regtest4.conf @@ -1,11 +1,13 @@ -# conf to run 2 intsances with single-contoller-multi-compute flavor +# conf to run openstack 2 intsances with single-contoller-multi-compute flavor export VIRT_NUM=${VIRT_NUM:-'3'} export VIRT_CPUS=${VIRT_CPUS:-'4'} export VIRT_MEM=${VIRT_MEM:-'8192'} export VIRT_DISK=${VIRT_DISK:-'30G'} -export HOSTNAMES=${HOSTNAMES:-'single-controller-controller,sinle-controller-network,single-controller-compute'} -export HOST_ROLES=${HOST_ROLES:-'single-controller-controller=os-controller;sinle-controller-network=os-network,os-block-storage-volume'} -export DEFAULT_ROLES=${DEFAULT_ROLES:-'os-compute-worker'} - -REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +export HOSTNAMES=${HOSTNAMES:-'controller,network,compute'} +export HOST_ROLES=${HOST_ROLES:-'controller=os-controller;network=os-network,os-block-storage-volume'} +export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-`echo $ipaddr |cut -d. -f'1 2 3'`.56} +export TENANT_IP_START=${TENANT_IP_START:-'172.16.2.56'} +export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.56'} +export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.56'} +export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) source ${REGTEST_DIR}/regtest2.conf diff --git a/regtest/regtest5.conf b/regtest/regtest5.conf index 7f3da128..e318d166 100644 --- a/regtest/regtest5.conf +++ b/regtest/regtest5.conf @@ -1,10 +1,13 @@ -# conf to run os-dashboard +# conf to install openstack on centos with multi node flavor export VIRT_NUM=${VIRT_NUM:-'12'} export VIRT_CPUS=${VIRT_CPUS:-'2'} export VIRT_MEM=${VIRT_MEM:-'8192'} export VIRT_DISK=${VIRT_DISK:-'20G'} -export HOSTNAMES=${HOSTNAMES:-'multinodes-database,multinodes-messaging,multinodes-identity,multinodes-compute-controller,multinodes-compute-worker1,multinodes-compute-worker2,multinodes-network-server,multinodes-network-worker,multinodes-block-storage-volume,multinodes-block-storage-controller,multinodes-image,multinodes-dashboard'} -export HOST_ROLES=${HOST_ROLES:-'multinodes-database=os-ops-database;multinodes-messaging=os-ops-messaging;multinodes-identity=os-identity;multinodes-compute-controller=os-compute-controller;multinodes-network-server=os-network-server;multinodes-network-worker=os-network-worker;multinodes-block-storage-volume=os-block-storage-volume;multinodes-block-storage-controller=os-block-storage-controller;multinodes-image=os-image;multinodes-dashboard=os-dashboard'} - -REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +export HOSTNAMES=${HOSTNAMES:-'database,messaging,identity,compute-controller,compute-worker1,compute-worker2,network-server,network-worker,block-storage-volume,block-storage-controller,image,dashboard'} +export HOST_ROLES=${HOST_ROLES:-'database=os-ops-database;messaging=os-ops-messaging;identity=os-identity;compute-controller=os-compute-controller;network-server=os-network-server;network-worker=os-network-worker;block-storage-volume=os-block-storage-volume;block-storage-controller=os-block-storage-controller;image=os-image;dashboard=os-dashboard'} +export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-`echo $ipaddr |cut -d. -f'1 2 3'`.60} +export TENANT_IP_START=${TENANT_IP_START:-'172.16.2.60'} +export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.60'} +export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.60'} +export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) source ${REGTEST_DIR}/regtest3.conf diff --git a/regtest/regtest6.conf b/regtest/regtest6.conf index e25fb32c..d6d7c375 100644 --- a/regtest/regtest6.conf +++ b/regtest/regtest6.conf @@ -1,10 +1,16 @@ -# conf to run 1 instance with single-contoller-multi-compute flavor +# conf to run 1 instance with os only export VIRT_NUM=${VIRT_NUM:-'1'} export VIRT_CPUS=${VIRT_CPUS:-'10'} export VIRT_MEM=${VIRT_MEM:-'8192'} export VIRT_DISK=${VIRT_DISK:-'30G'} -export HOSTNAMES=${HOSTNAMES:-'osonly'} -REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +export CLUSTER_NAME=${CLUSTER_NAME:-'osonly'} +export HOSTNAMES=${HOSTNAMES:-'centos'} +export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-`echo $ipaddr |cut -d. -f'1 2 3'`.80} +export TENANT_IP_START=${TENANT_IP_START:-'172.16.2.80'} +export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.80'} +export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.80'} + +export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) source ${REGTEST_DIR}/regtest.conf export HOST_ROLES='' diff --git a/regtest/regtest7.conf b/regtest/regtest7.conf new file mode 100644 index 00000000..157602f1 --- /dev/null +++ b/regtest/regtest7.conf @@ -0,0 +1,13 @@ +# conf to run 1 instance with os only +export VIRT_NUM=${VIRT_NUM:-'1'} +export VIRT_CPUS=${VIRT_CPUS:-'10'} +export VIRT_MEM=${VIRT_MEM:-'8192'} +export VIRT_DISK=${VIRT_DISK:-'30G'} +export HOSTNAMES=${HOSTNAMES:-'ubuntu'} +export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu.*'} +export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-`echo $ipaddr |cut -d. -f'1 2 3'`.82} +export TENANT_IP_START=${TENANT_IP_START:-'172.16.2.82'} +export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.82'} +export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.82'} +export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +source ${REGTEST_DIR}/regtest6.conf diff --git a/regtest/regtest8.conf b/regtest/regtest8.conf new file mode 100644 index 00000000..d4b493b2 --- /dev/null +++ b/regtest/regtest8.conf @@ -0,0 +1,13 @@ +# conf to run 1 instance with allinone flavor +export VIRT_NUM=${VIRT_NUM:-'1'} +export VIRT_CPUS=${VIRT_CPUS:-'10'} +export VIRT_MEM=${VIRT_MEM:-'8192'} +export VIRT_DISK=${VIRT_DISK:-'30G'} +export CLUSTER_NAME=${CLUSTER_NAME:-'allinone-ubuntu'} +export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu.*'} +export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-`echo $ipaddr |cut -d. -f'1 2 3'`.84} +export TENANT_IP_START=${TENANT_IP_START:-'172.16.2.84'} +export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.84'} +export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.84'} +export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +source ${REGTEST_DIR}/regtest.conf diff --git a/regtest/regtest9.conf b/regtest/regtest9.conf new file mode 100644 index 00000000..811a34bc --- /dev/null +++ b/regtest/regtest9.conf @@ -0,0 +1,17 @@ +# conf to run openstack 2 intsances with single-contoller-multi-compute flavor +export VIRT_NUM=${VIRT_NUM:-'3'} +export VIRT_CPUS=${VIRT_CPUS:-'4'} +export VIRT_MEM=${VIRT_MEM:-'8192'} +export VIRT_DISK=${VIRT_DISK:-'30G'} +export CLUSTER_NAME=${CLUSTER_NAME:-'single-controller-ubuntu'} +export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu.*'} +export HOSTNAMES=${HOSTNAMES:-'controller,network,compute'} +export HOST_ROLES=${HOST_ROLES:-'controller=os-controller;network=os-network,os-block-storage-volume'} +export DEFAULT_ROLES=${DEFAULT_ROLES:-'os-compute-worker'} +export ADAPTER_FLAVOR_PATTERN=${ADAPTER_FLAVOR_PATTERN:-'single-contoller-multi-compute'} +export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-`echo $ipaddr |cut -d. -f'1 2 3'`.86} +export TENANT_IP_START=${TENANT_IP_START:-'172.16.2.86'} +export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.86'} +export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.86'} +export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +source ${REGTEST_DIR}/regtest.conf