diff options
| author |   rexlee8776 <limingjiang@huawei.com> | 2016-01-08 14:53:12 +0800 |
|---|---|---|
| committer | rexlee8776 <limingjiang@huawei.com> | 2016-01-10 09:20:03 +0000 |
| commit | f476468dc4fac62f43987edf3c2501a209b8bcda (patch) | |
| tree | 60b9579348c4f1ee10a797653445a88cdc097baf /utils | |
| parent | 7be8a9f58376fb3ef0b2f5ecde03edca0e80035a (diff) | |
Add dashboard configuration
JIRA: BOTTLENECK-30
Change-Id: Ic093abb9c8b70f5722737c0aa2066455d805e679
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/dashboard/dashboard.yaml | 8 | ||||
| -rwxr-xr-x | utils/infra_setup/heat_template/HOT_create_instance.sh | 9 | ||||
| -rwxr-xr-x | utils/infra_setup/vm_dev_setup/setup_env.sh | 2 |
3 files changed, 14 insertions, 5 deletions
diff --git a/utils/dashboard/dashboard.yaml b/utils/dashboard/dashboard.yaml index dbc9d8e6..56607701 100644 --- a/utils/dashboard/dashboard.yaml +++ b/utils/dashboard/dashboard.yaml @@ -1,6 +1,6 @@ --- -pod_name: unknown-pod -installer: fuel -version: unknown -target: http://127.0.0.1/results +pod_name: REPLACE_POD_NAME +installer: REPLACE_INSTALLER_TYPE +version: REPLACE_VERSION +target: http://REPLACE_BOTTLENECKS_DB_TARGET/results diff --git a/utils/infra_setup/heat_template/HOT_create_instance.sh b/utils/infra_setup/heat_template/HOT_create_instance.sh index bdcb7ef9..ec5b3666 100755 --- a/utils/infra_setup/heat_template/HOT_create_instance.sh +++ b/utils/infra_setup/heat_template/HOT_create_instance.sh @@ -167,6 +167,11 @@ bottlenecks_rubbos_run() echo "GERRIT_REFSPEC_DEBUG=$GERRIT_REFSPEC_DEBUG" >> $BOTTLENECKS_REPO_DIR/utils/infra_setup/vm_dev_setup/hosts.conf + echo "POD_NAME=$POD_NAME" >> $BOTTLENECKS_REPO_DIR/utils/infra_setup/vm_dev_setup/hosts.conf + echo "INSTALLER_TYPE=$INSTALLER_TYPE" >> $BOTTLENECKS_REPO_DIR/utils/infra_setup/vm_dev_setup/hosts.conf + echo "BOTTLENECKS_VERSION=$BOTTLENECKS_VERSION" >> $BOTTLENECKS_REPO_DIR/utils/infra_setup/vm_dev_setup/hosts.conf + echo "BOTTLENECKS_DB_TARGET=$BOTTLENECKS_DB_TARGET" >> $BOTTLENECKS_REPO_DIR/utils/infra_setup/vm_dev_setup/hosts.conf + scp $ssh_args -r \ $BOTTLENECKS_REPO_DIR/utils/infra_setup/vm_dev_setup \ ec2-user@$control_ip:/tmp @@ -255,6 +260,10 @@ main() TEMPLATE_NAME=bottlenecks_rubbos_hot.yaml PUBLIC_NET_NAME=net04_ext ssh_args="-o StrictHostKeyChecking=no -o BatchMode=yes -i $KEY_PATH/bottlenecks_key" + : ${POD_NAME:='opnfv-jump-2'} + : ${INSTALLER_TYPE:='fuel'} + : ${BOTTLENECKS_VERSION:='master'} + : ${BOTTLENECKS_DB_TARGET:='213.77.62.197'} bottlenecks_env_prepare set -x diff --git a/utils/infra_setup/vm_dev_setup/setup_env.sh b/utils/infra_setup/vm_dev_setup/setup_env.sh index 795a0a6a..7a69e83c 100755 --- a/utils/infra_setup/vm_dev_setup/setup_env.sh +++ b/utils/infra_setup/vm_dev_setup/setup_env.sh @@ -20,7 +20,7 @@ wait_vm_ok() { bottlenecks_prepare_env() { - echo "Bottlenecks prepare env in VMs" + echo "Bottlenecks prepare env" # configue rubbos control ssh key generate_ssh_key |