aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/heat
diff options
context:
space:
mode:
authorHelen Chen <helen.chen@huawei.com>2018-05-31 03:07:18 +0000
committerGerrit Code Review <gerrit@onap.org>2018-05-31 03:07:18 +0000
commit0a04ab4d20daf1ddcf17044ff3b90615f9ece3ba (patch)
tree163b64fd7bf992305cf23826154a2391ba35104f /deployment/heat
parenta928bba72b86e8edc66cce5640ba4b1d1d7b5bb2 (diff)
parent14d5f3438170ef4fba9260a0b52b15a95b39f59b (diff)
Merge "Change default pull policy to IfNotPresent" into beijing
Diffstat (limited to 'deployment/heat')
-rw-r--r--deployment/heat/onap-oom/env/gwu/onap.env2
-rw-r--r--deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env2
-rw-r--r--deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env2
-rw-r--r--deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env2
-rw-r--r--deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-00.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-01.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-02.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-03.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-04.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-05.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-06.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-07.env2
14 files changed, 14 insertions, 14 deletions
diff --git a/deployment/heat/onap-oom/env/gwu/onap.env b/deployment/heat/onap-oom/env/gwu/onap.env
index 2b10306f5..efc263e07 100644
--- a/deployment/heat/onap-oom/env/gwu/onap.env
+++ b/deployment/heat/onap-oom/env/gwu/onap.env
@@ -15,7 +15,7 @@ parameters:
integration_override_yaml: >
global:
repository: 192.168.1.51:5000
- pullPolicy: Always
+ pullPolicy: IfNotPresent
robot:
openStackKeyStoneUrl: "http://192.168.1.11:5000"
openStackPublicNetId: "024582bd-ef9b-48b9-9e70-e6732559d9df"
diff --git a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
index 4cdd16c54..f50d85a31 100644
--- a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
+++ b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
@@ -15,7 +15,7 @@ parameters:
integration_override_yaml: >
global:
repository: 10.145.122.118:5000
- pullPolicy: Always
+ pullPolicy: IfNotPresent
robot:
openStackKeyStoneUrl: "http://10.145.122.117:5000"
openStackPublicNetId: "3a6247f1-fac6-4167-a49f-33cc8415ccf4"
diff --git a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
index ec220dc58..fb9ad20bb 100644
--- a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
+++ b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
@@ -15,7 +15,7 @@ parameters:
integration_override_yaml: >
global:
repository: 192.168.31.204:5000
- pullPolicy: Always
+ pullPolicy: IfNotPresent
robot:
openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
openStackPublicNetId: "__oam_network_id__"
diff --git a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
index ec220dc58..fb9ad20bb 100644
--- a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
+++ b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
@@ -15,7 +15,7 @@ parameters:
integration_override_yaml: >
global:
repository: 192.168.31.204:5000
- pullPolicy: Always
+ pullPolicy: IfNotPresent
robot:
openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
openStackPublicNetId: "__oam_network_id__"
diff --git a/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env b/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env
index ec220dc58..fb9ad20bb 100644
--- a/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env
+++ b/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env
@@ -15,7 +15,7 @@ parameters:
integration_override_yaml: >
global:
repository: 192.168.31.204:5000
- pullPolicy: Always
+ pullPolicy: IfNotPresent
robot:
openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
openStackPublicNetId: "__oam_network_id__"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
index 8336b504b..20e78f5c0 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
@@ -15,7 +15,7 @@ parameters:
integration_override_yaml: >
global:
repository: 10.12.5.2:5000
- pullPolicy: Always
+ pullPolicy: IfNotPresent
robot:
openStackKeyStoneUrl: "http://10.12.25.2:5000"
openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
index 8336b504b..20e78f5c0 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
@@ -15,7 +15,7 @@ parameters:
integration_override_yaml: >
global:
repository: 10.12.5.2:5000
- pullPolicy: Always
+ pullPolicy: IfNotPresent
robot:
openStackKeyStoneUrl: "http://10.12.25.2:5000"
openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
index 8336b504b..20e78f5c0 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
@@ -15,7 +15,7 @@ parameters:
integration_override_yaml: >
global:
repository: 10.12.5.2:5000
- pullPolicy: Always
+ pullPolicy: IfNotPresent
robot:
openStackKeyStoneUrl: "http://10.12.25.2:5000"
openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
index 8336b504b..20e78f5c0 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
@@ -15,7 +15,7 @@ parameters:
integration_override_yaml: >
global:
repository: 10.12.5.2:5000
- pullPolicy: Always
+ pullPolicy: IfNotPresent
robot:
openStackKeyStoneUrl: "http://10.12.25.2:5000"
openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
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 8336b504b..20e78f5c0 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
@@ -15,7 +15,7 @@ parameters:
integration_override_yaml: >
global:
repository: 10.12.5.2:5000
- pullPolicy: Always
+ pullPolicy: IfNotPresent
robot:
openStackKeyStoneUrl: "http://10.12.25.2:5000"
openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
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 8336b504b..20e78f5c0 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
@@ -15,7 +15,7 @@ parameters:
integration_override_yaml: >
global:
repository: 10.12.5.2:5000
- pullPolicy: Always
+ pullPolicy: IfNotPresent
robot:
openStackKeyStoneUrl: "http://10.12.25.2:5000"
openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
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 8336b504b..20e78f5c0 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
@@ -15,7 +15,7 @@ parameters:
integration_override_yaml: >
global:
repository: 10.12.5.2:5000
- pullPolicy: Always
+ pullPolicy: IfNotPresent
robot:
openStackKeyStoneUrl: "http://10.12.25.2:5000"
openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
index 8336b504b..20e78f5c0 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
@@ -15,7 +15,7 @@ parameters:
integration_override_yaml: >
global:
repository: 10.12.5.2:5000
- pullPolicy: Always
+ pullPolicy: IfNotPresent
robot:
openStackKeyStoneUrl: "http://10.12.25.2:5000"
openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
index 8336b504b..20e78f5c0 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
@@ -15,7 +15,7 @@ parameters:
integration_override_yaml: >
global:
repository: 10.12.5.2:5000
- pullPolicy: Always
+ pullPolicy: IfNotPresent
robot:
openStackKeyStoneUrl: "http://10.12.25.2:5000"
openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"