Browse Source

Merge "update exports"

Jenkins 2 years ago
parent
commit
86974f8dc1
2 changed files with 38 additions and 16 deletions
  1. 14
    16
      plugin_test/vapor/exports.sh
  2. 24
    0
      plugin_test/vapor/roles_mcp10_contrail.yaml

+ 14
- 16
plugin_test/vapor/exports.sh View File

@@ -1,22 +1,20 @@
1
-#!/usr/bin/env bash
2
-# OpenStack credentials:
1
+#!/bin/bash
3 2
 export OS_USERNAME=admin
4
-export OS_PASSWORD=secret
5
-export OS_TENANT_NAME=admin
6
-export OS_AUTH_URL=http://127.0.0.1:5000/v3
3
+export OS_PASSWORD=password
4
+export OS_TENANR_NAME=admin
5
+export OS_AUTH_URL=http://10.167.4.10:35357/v3
6
+export VIRTUAL_DISPLAY=1
7 7
 
8
-# contrail endpoints
9
-export CONTRAIL_API_URL=http://172.16.10.254:9100/
10
-export CONTRAIL_ANALYTICS_URL=http://172.16.10.254:9081/
11
-
12
-# os-faults config
13 8
 export OS_FAULTS_CLOUD_DRIVER=tcpcloud
14
-export OS_FAULTS_CLOUD_DRIVER_ADDRESS=192.168.10.100
15
-export OS_FAULTS_CLOUD_DRIVER_KEYFILE=/home/jenkins/cloud.key
9
+export OS_FAULTS_CLOUD_DRIVER_KEYFILE=/opt/vapor/cloud.key
10
+export OS_FAULTS_CLOUD_DRIVER_ADDRESS=172.16.49.66
16 11
 export OS_FAULTS_CLOUD_DRIVER_USERNAME=root
17 12
 
18
-export CONTRAIL_ROLES_DISTRIBUTION_YAML=roles_distribution_example.yaml
13
+export CONTRAIL_ROLES_DISTRIBUTION_YAML=roles_mcp10_contrail.yaml
14
+export CONTRAIL_API_URL=http://10.167.4.20:9100/
15
+export CONTRAIL_ANALYTICS_URL=http://10.167.4.30:8081/
19 16
 
20
-#export OS_PROJECT_DOMAIN_NAME=default
21
-#export OS_USER_DOMAIN_NAME=default
22
-#export OS_PROJECT_NAME=admin
17
+#export DEFAULT_FLAVOR_RAM="2048"
18
+#export DEFAULT_FLAVOR_CPU="2"
19
+#export DEFAULT_FLAVOR_DISK="20"
20
+#export DEFAULT_FLAVOR_METADATA='{"hw:mem_page_size":"large"}'

+ 24
- 0
plugin_test/vapor/roles_mcp10_contrail.yaml View File

@@ -0,0 +1,24 @@
1
+contrail-controller:
2
+  - ntw01.mcp10-opencontrail.local
3
+  - ntw02.mcp10-opencontrail.local
4
+  - ntw03.mcp10-opencontrail.local
5
+contrail-config:
6
+  - ntw01.mcp10-opencontrail.local
7
+  - ntw02.mcp10-opencontrail.local
8
+  - ntw03.mcp10-opencontrail.local
9
+contrail-analytics:
10
+  - nal01.mcp10-opencontrail.local
11
+  - nal02.mcp10-opencontrail.local
12
+  - nal03.mcp10-opencontrail.local
13
+contrail-db:
14
+  - ntw01.mcp10-opencontrail.local
15
+  - ntw02.mcp10-opencontrail.local
16
+  - ntw03.mcp10-opencontrail.local
17
+contrail-analytics-db:
18
+  - nal01.mcp10-opencontrail.local
19
+  - nal02.mcp10-opencontrail.local
20
+  - nal03.mcp10-opencontrail.local
21
+contrail-compute:
22
+  - cmp001.mcp10-opencontrail.local
23
+  - cmp002.mcp10-opencontrail.local
24
+  - cmp003.mcp10-opencontrail.local

Loading…
Cancel
Save