diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-02-14 17:04:05 -0800 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-02-14 17:04:05 -0800 |
| commit | 5c84a1876fbb78a376fe210b967caa4132b272d6 (patch) | |
| tree | 8867bc4cab504ca8ae3ca249295de99af6a89158 | |
| parent | 06de16ad21868809e1b96d15962f4cd3db1ee1f6 (diff) | |
Change IP addr of docker proxy in windriver lab
Change-Id: I3d817abd9a5068ea128163d24fa9804dbfa69142
Issue-ID: INT-278
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
6 files changed, 11 insertions, 11 deletions
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env index a3290a3cd..846d77b6e 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env @@ -10,8 +10,8 @@ parameters: ubuntu_1604_image: ubuntu-16-04-cloud-amd64 centos_7_image: CentOS-7 - apt_proxy: 10.12.5.80:3142 - docker_proxy: 10.12.5.80:5000 + apt_proxy: 10.12.5.2:3142 + docker_proxy: 10.12.5.2:5000 rancher_vm_flavor: m1.small k8s_vm_flavor: m1.xxlarge diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env index 996e7b45f..98c6c5f25 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env @@ -10,8 +10,8 @@ parameters: ubuntu_1604_image: ubuntu-16-04-cloud-amd64 centos_7_image: CentOS-7 - apt_proxy: 10.12.5.80:3142 - docker_proxy: 10.12.5.80:5000 + apt_proxy: 10.12.5.2:3142 + docker_proxy: 10.12.5.2:5000 rancher_vm_flavor: m1.small k8s_vm_flavor: m1.xxlarge diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env index 8d9b3533b..ea7aa7ddb 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env @@ -10,8 +10,8 @@ parameters: ubuntu_1604_image: ubuntu-16-04-cloud-amd64 centos_7_image: CentOS-7 - apt_proxy: 10.12.5.80:3142 - docker_proxy: 10.12.5.80:5000 + apt_proxy: 10.12.5.2:3142 + docker_proxy: 10.12.5.2:5000 rancher_vm_flavor: m1.small k8s_vm_flavor: m1.xxlarge diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env index 492c8cd44..5369182b4 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env @@ -10,8 +10,8 @@ parameters: ubuntu_1604_image: ubuntu-16-04-cloud-amd64 centos_7_image: CentOS-7 - apt_proxy: 10.12.5.80:3142 - docker_proxy: 10.12.5.80:5000 + apt_proxy: 10.12.5.2:3142 + docker_proxy: 10.12.5.2:5000 rancher_vm_flavor: m1.small k8s_vm_flavor: m1.xxlarge diff --git a/test/ete/labs/windriver/apt-proxy.sh b/test/ete/labs/windriver/apt-proxy.sh index f8bb32ff0..54b15bba6 100755 --- a/test/ete/labs/windriver/apt-proxy.sh +++ b/test/ete/labs/windriver/apt-proxy.sh @@ -3,11 +3,11 @@ sed -i '/#!\/bin\/bash/a\ mkdir -p /etc/docker\ cat > /etc/docker/daemon.json <<EOF\ {\ - "insecure-registries" : ["10.12.5.80:5000"]\ + "insecure-registries" : ["10.12.5.2:5000"]\ }\ EOF\ cat > /etc/apt/apt.conf.d/30proxy<<EOF\ - Acquire::http { Proxy "http://10.12.5.80:3142"; };\ + Acquire::http { Proxy "http://10.12.5.2:3142"; };\ Acquire::https::Proxy "DIRECT";\ EOF\ apt-get -y update' $1 diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env index 1992a42ed..27cd0ef62 100644 --- a/test/ete/labs/windriver/onap-openstack-template.env +++ b/test/ete/labs/windriver/onap-openstack-template.env @@ -32,7 +32,7 @@ parameters: nexus_repo: https://nexus.onap.org/content/sites/raw - nexus_docker_repo: 10.12.5.80:5000 + nexus_docker_repo: 10.12.5.2:5000 nexus_username: anonymous |