diff options
Diffstat (limited to 'deploy/conf')
| -rw-r--r-- | deploy/conf/base.conf | 6 | ||||
| -rw-r--r-- | deploy/conf/cluster.conf | 25 | ||||
| -rw-r--r-- | deploy/conf/virtual.conf | 2 |
3 files changed, 17 insertions, 16 deletions
diff --git a/deploy/conf/base.conf b/deploy/conf/base.conf index 45970a05..d7d2f4ef 100644 --- a/deploy/conf/base.conf +++ b/deploy/conf/base.conf @@ -12,7 +12,7 @@ export MGMT_IP_END=${MGMT_IP_END:-192.168.200.254} export EXTERNAL_NIC=${EXTERNAL_NIC:-eth0} export CLUSTER_NAME="opnfv2" export DOMAIN="ods.com" -export PARTITIONS="/=70%,/home=5%,/tmp=5%,/var=20%" +export PARTITIONS="/=30%,/home=5%,/tmp=5%,/var=60%" 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'} @@ -59,6 +59,6 @@ export GATEWAY="10.1.0.1" export SERVER_CREDENTIAL="root=root" export LOCAL_REPO_URL="" export OS_CONFIG_FILENAME="" -export SERVICE_CREDENTIALS="image:service=service,compute:service=service,dashboard:service=service,identity:service=service,metering:service=service,rabbitmq:service=service,volume:service=service,mysql:service=service,heat:heat=heat_secret" -export CONSOLE_CREDENTIALS="admin:console=console,compute:console=console,dashboard:console=console,image:console=console,metering:console=console,network:console=console,object-store:console=console,volume:console=console,heat:heat=heat_db_secret" +export SERVICE_CREDENTIALS="image:service=service,compute:service=service,dashboard:service=service,identity:service=service,image:service=service,metering:service=service,network:service=service,rabbitmq:service=service,volume:service=service,mysql:service=service,heat:heat=heat_db_secret" +export CONSOLE_CREDENTIALS="admin:console=console,demo:console=console,compute:console=console,dashboard:console=console,identity:console=console,image:console=console,metering:console=console,network:console=console,object-store:console=console,volume:console=console,heat:heat=heat_secret" export PACKAGE_CONFIG_FILENAME="" diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf index 200fae65..f741895b 100644 --- a/deploy/conf/cluster.conf +++ b/deploy/conf/cluster.conf @@ -1,18 +1,19 @@ +# for Operating System export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-14\.04\.3.*'} -export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$" +#export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*15.*'} + +# trustry/centos7 +export OS_VERSION=${OS_VERSION:-"trusty"} -export REPO_NAME=${REPO_NAME:-"trusty-juno-ppa"} -export ADAPTER_NAME="openstack_juno" -export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-juno" -#export REPO_NAME=${REPO_NAME:-"trusty-liberty-ppa"} -#export ADAPTER_NAME="openstack_liberty" -#export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-liberty" +# liberty/kilo/juno +export OPENSTACK_VERSION=${OPENSTACK_VERSION:-"liberty"} + +# don't touch this +export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$" -#export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*1503-01.*'} -#export REPO_NAME=${REPO_NAME:-"centos7-kilo-ppa"} -#export ADAPTER_NAME="openstack_kilo" -#export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$" -#export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-kilo" +export REPO_NAME="$OS_VERSION-$OPENSTACK_VERSION-ppa" +export ADAPTER_NAME="openstack_$OPENSTACK_VERSION" +export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-$OPENSTACK_VERSION" export DEFAULT_ROLES="" export VIP="10.1.0.222" diff --git a/deploy/conf/virtual.conf b/deploy/conf/virtual.conf index 0dbdb28b..611aca76 100644 --- a/deploy/conf/virtual.conf +++ b/deploy/conf/virtual.conf @@ -1,7 +1,7 @@ export VIRT_NUMBER=5 export VIRT_CPUS=4 export VIRT_MEM=16384 -export VIRT_DISK=30G +export VIRT_DISK=50G export SWITCH_IPS="1.1.1.1" export SWITCH_CREDENTIAL="version=2c,community=public" |