diff options
| author |   Yang Xu <yang.xu3@huawei.com> | 2018-07-24 00:20:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-07-24 00:20:54 +0000 |
| commit | ac63dd52f4bc8fbdbe231120d06b8bef3c165973 (patch) | |
| tree | 615f5b931eaa1201871deedc931399c50c6e84c4 | |
| parent | 0e0a1d623285e0736696a9f3cd4bd42fc529af56 (diff) | |
| parent | 4c7eb3d89df9f7f4e153711274a33ec0d74b254f (diff) | |
Merge "Update lab RC config"
| -rw-r--r-- | deployment/heat/onap-oom/env/gwu/onap-heat-openrc | 2 | ||||
| -rw-r--r-- | deployment/heat/onap-oom/env/gwu/onap-heat.env | 6 | ||||
| -rw-r--r-- | deployment/heat/onap-oom/env/gwu/onap-oom-openrc | 2 | ||||
| -rw-r--r-- | deployment/heat/onap-oom/env/gwu/onap-oom.env | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/deployment/heat/onap-oom/env/gwu/onap-heat-openrc b/deployment/heat/onap-oom/env/gwu/onap-heat-openrc index c28e37823..fcad4db01 100644 --- a/deployment/heat/onap-oom/env/gwu/onap-heat-openrc +++ b/deployment/heat/onap-oom/env/gwu/onap-heat-openrc @@ -1,6 +1,6 @@ export OS_PROJECT_DOMAIN_NAME=Default export OS_USER_DOMAIN_NAME=Default -export OS_PROJECT_ID=7504c113f3b241fab1ee9d3d9323f6c1 +export OS_PROJECT_ID=675ca78806b7485e9c96bd70cd5734ac export OS_PROJECT_NAME=onap-heat export OS_USERNAME=demo #export OS_PASSWORD=demo diff --git a/deployment/heat/onap-oom/env/gwu/onap-heat.env b/deployment/heat/onap-oom/env/gwu/onap-heat.env index 4cbcd6c8f..09a29add3 100644 --- a/deployment/heat/onap-oom/env/gwu/onap-heat.env +++ b/deployment/heat/onap-oom/env/gwu/onap-heat.env @@ -3,12 +3,12 @@ parameters: ubuntu_1604_image: xenial apt_proxy: 192.168.1.51:3142 - docker_proxy: 192.168.2.20:5000 + docker_proxy: 192.168.2.18:5000 rancher_vm_flavor: m1.xlarge k8s_vm_flavor: m1.xlarge - public_net_id: bfd766f4-ccb5-4d14-944a-fcf1a94a824c + public_net_id: c3352d4c-8452-4172-b09c-15f017673708 key_name: onap-key oam_network_cidr: 10.0.0.0/16 @@ -19,7 +19,7 @@ parameters: pullPolicy: IfNotPresent robot: openStackKeyStoneUrl: "http://192.168.1.11:5000" - openStackPublicNetId: "024582bd-ef9b-48b9-9e70-e6732559d9df" + openStackPublicNetId: "c3352d4c-8452-4172-b09c-15f017673708" openStackPassword: "${OS_PASSWORD}" openStackTenantId: "${OS_PROJECT_ID}" openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/gwu/onap-oom-openrc b/deployment/heat/onap-oom/env/gwu/onap-oom-openrc index d11ead498..63e53117c 100644 --- a/deployment/heat/onap-oom/env/gwu/onap-oom-openrc +++ b/deployment/heat/onap-oom/env/gwu/onap-oom-openrc @@ -1,6 +1,6 @@ export OS_PROJECT_DOMAIN_NAME=Default export OS_USER_DOMAIN_NAME=Default -export OS_PROJECT_ID=6d39557690ff4bc18372d0ca6c0e3d82 +export OS_PROJECT_ID=e6507947d42646ea8045bcf2956b753a export OS_PROJECT_NAME=onap-oom export OS_USERNAME=demo #export OS_PASSWORD=demo diff --git a/deployment/heat/onap-oom/env/gwu/onap-oom.env b/deployment/heat/onap-oom/env/gwu/onap-oom.env index 4cbcd6c8f..0090e604d 100644 --- a/deployment/heat/onap-oom/env/gwu/onap-oom.env +++ b/deployment/heat/onap-oom/env/gwu/onap-oom.env @@ -3,12 +3,12 @@ parameters: ubuntu_1604_image: xenial apt_proxy: 192.168.1.51:3142 - docker_proxy: 192.168.2.20:5000 + docker_proxy: 192.168.2.18:5000 rancher_vm_flavor: m1.xlarge - k8s_vm_flavor: m1.xlarge + k8s_vm_flavor: c1.xlarge - public_net_id: bfd766f4-ccb5-4d14-944a-fcf1a94a824c + public_net_id: c3352d4c-8452-4172-b09c-15f017673708 key_name: onap-key oam_network_cidr: 10.0.0.0/16 @@ -19,7 +19,7 @@ parameters: pullPolicy: IfNotPresent robot: openStackKeyStoneUrl: "http://192.168.1.11:5000" - openStackPublicNetId: "024582bd-ef9b-48b9-9e70-e6732559d9df" + openStackPublicNetId: "c3352d4c-8452-4172-b09c-15f017673708" openStackPassword: "${OS_PASSWORD}" openStackTenantId: "${OS_PROJECT_ID}" openStackUserName: "${OS_USERNAME}" |