Update OOF installation scripts

Change-Id: Ieba914164b62c461466c57c05921f391ea16fe3d
Issue-ID: INT-444
Signed-off-by: Marco Platania <platania@research.att.com>

4 files changed, 21 insertions, 1 deletions

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 9e8cc3a2..cae20a8d 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -135,6 +135,7 @@ parameters:
   music_branch: master
   nbi_branch: master
   aaf_branch: master
+  oof_branch: master
 
   aai_docker: 1.2-STAGING-latest
   aai_sparky_docker: 1.2-STAGING-latest
@@ -226,3 +227,4 @@ parameters:
   music_repo: http://gerrit.onap.org/r/music.git
   nbi_repo: http://gerrit.onap.org/r/externalapi/nbi.git
   aaf_repo: http://gerrit.onap.org/r/aaf/authz.git
+  oof_repo: http://gerrit.onap.org/r/optf/has.git
\ No newline at end of file
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index d468ce52..6ff45020 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -300,6 +300,8 @@ parameters:
     type: string
   aaf_repo:
     type: string
+  oof_repo:
+    type: string
 
   ################################
   #                              #
@@ -497,6 +499,8 @@ parameters:
     type: string
   aaf_branch:
     type: string
+  oof_branch:
+    type: string
 
 #############
 #           #
@@ -2072,6 +2076,8 @@ resources:
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
             __docker_version__: { get_param: oof_docker }
+            __oof_repo__: { get_param: oof_repo }
+            __gerrit_branch__: { get_param: oof_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
           template: |
@@ -2086,6 +2092,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 "__oof_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 4cbfddee..6404d1c7 100644
--- a/heat/ONAP/onap_openstack_light.yaml
+++ b/heat/ONAP/onap_openstack_light.yaml
@@ -296,6 +296,8 @@ parameters:
     type: string
   aaf_repo:
     type: string
+  oof_repo:
+    type: string
 
   ################################
   #                              #
@@ -420,6 +422,8 @@ parameters:
     type: string
   aaf_branch:
     type: string
+  oof_branch:
+    type: string
 
 #############
 #           #
@@ -1950,6 +1954,8 @@ resources:
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
             __docker_version__: { get_param: oof_docker }
+            __oof_repo__: { get_param: oof_repo }
+            __gerrit_branch__: { get_param: oof_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
           template: |
@@ -1964,6 +1970,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 "__oof_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_template.env b/heat/ONAP/onap_openstack_template.env
index 475efd7c..c8f76f2a 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -134,6 +134,7 @@ parameters:
   vnfsdk_branch: master
   music_branch: master
   aaf_branch: master
+  oof_branch: master
 
   aai_docker: ${AAI_RESOURCES_DOCKER}
   aai_sparky_docker: ${AAI_RESOURCES_DOCKER}
@@ -223,4 +224,5 @@ 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
-  aaf_repo: http://gerrit.onap.org/r/aaf/authz.git
\ No newline at end of file
+  aaf_repo: http://gerrit.onap.org/r/aaf/authz.git
+  oof_repo: http://gerrit.onap.org/r/optf/has.git
\ No newline at end of file