summaryrefslogtreecommitdiffstats
path: root/heat
diff options
context:
space:
mode:
authorRene Robert <rene.robert@orange.com>2018-04-16 12:48:30 +0000
committerRene Robert <rene.robert@orange.com>2018-04-16 12:50:32 +0000
commitd0a28c37338215265449d013dbbdd96962334b00 (patch)
tree9782a63ffd7b9b9b9d723ad0a613dee65e1467a0 /heat
parentdc99e44fd343d7236bfa4c4d54f8444c421b0e72 (diff)
complete nbi install
Issue-ID: INT-456 Change-Id: I8a16fde4627f61af7556006fafc0dcbfd9a429cc Signed-off-by: Rene Robert <rene.robert@orange.com>
Diffstat (limited to 'heat')
-rw-r--r--heat/ONAP/onap_openstack.env2
-rw-r--r--heat/ONAP/onap_openstack.yaml9
-rw-r--r--heat/ONAP/onap_openstack_light.yaml9
3 files changed, 18 insertions, 2 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index ccd67fe9..00bdeeec 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -133,6 +133,7 @@ parameters:
clamp_branch: master
vnfsdk_branch: master
music_branch: master
+ nbi_branch: master
aai_docker: 1.2-STAGING-latest
aai_sparky_docker: 1.2-STAGING-latest
@@ -204,3 +205,4 @@ parameters:
clamp_repo: http://gerrit.onap.org/r/clamp.git
vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git
music_repo: http://gerrit.onap.org/r/music.git
+ nbi_repo: http://gerrit.onap.org/r/externalapi/nbi.git
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 5ee87b56..eba6d0d5 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -296,6 +296,8 @@ parameters:
type: string
music_repo:
type: string
+ nbi_repo:
+ type: string
################################
# #
@@ -418,7 +420,8 @@ parameters:
type: string
music_branch:
type: string
-
+ nbi_branch:
+ type: string
#############
# #
@@ -2077,6 +2080,8 @@ resources:
__artifacts_version__: { get_param: artifacts_version }
__dns_ip_addr__: { get_param: dns_ip_addr }
__docker_version__: { get_param: nbi_docker }
+ __nbi_repo__: { get_param: nbi_repo }
+ __gerrit_branch__: { get_param: nbi_branch }
__cloud_env__: { get_param: cloud_env }
__external_dns__: { get_param: external_dns }
template: |
@@ -2091,6 +2096,8 @@ resources:
echo "__artifacts_version__" > /opt/config/artifacts_version.txt
echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
echo "__docker_version__" > /opt/config/docker_version.txt
+ echo "__nbi_repo__" > /opt/config/remote_repo.txt
+ echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
echo "__external_dns__" > /opt/config/external_dns.txt
diff --git a/heat/ONAP/onap_openstack_light.yaml b/heat/ONAP/onap_openstack_light.yaml
index 720b39d2..19819566 100644
--- a/heat/ONAP/onap_openstack_light.yaml
+++ b/heat/ONAP/onap_openstack_light.yaml
@@ -292,6 +292,8 @@ parameters:
type: string
music_repo:
type: string
+ nbi_repo:
+ type: string
################################
# #
@@ -412,7 +414,8 @@ parameters:
type: string
music_branch:
type: string
-
+ nbi_branch:
+ type: string
#############
# #
@@ -2065,6 +2068,8 @@ resources:
__artifacts_version__: { get_param: artifacts_version }
__dns_ip_addr__: { get_param: dns_ip_addr }
__docker_version__: { get_param: nbi_docker }
+ __nbi_repo__: { get_param: nbi_repo }
+ __gerrit_branch__: { get_param: nbi_branch }
__cloud_env__: { get_param: cloud_env }
__external_dns__: { get_param: external_dns }
template: |
@@ -2079,6 +2084,8 @@ resources:
echo "__artifacts_version__" > /opt/config/artifacts_version.txt
echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
echo "__docker_version__" > /opt/config/docker_version.txt
+ echo "__nbi_repo__" > /opt/config/remote_repo.txt
+ echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
echo "__external_dns__" > /opt/config/external_dns.txt