From a310c917999db3edfb2eba58485d674ae8b35547 Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Mon, 16 Apr 2018 09:49:01 -0400 Subject: Install AAF with Heat (WIP) Change-Id: I65a9ded45dbaf238cbef4a3b29b6ecfc7171e670 Issue-ID: INT-444 Signed-off-by: Marco Platania --- heat/ONAP/onap_openstack.env | 2 +- heat/ONAP/onap_openstack.yaml | 4 ++++ heat/ONAP/onap_openstack_light.yaml | 4 ++++ heat/ONAP/onap_openstack_template.env | 2 ++ 4 files changed, 11 insertions(+), 1 deletion(-) (limited to 'heat/ONAP') diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index db18ee2f..329b677c 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -155,7 +155,7 @@ parameters: cli_docker: v1.1.0 music_docker: latest oof_docker: latest - aaf_docker: latest + aaf_docker: 2.1.0-SNAPSHOT nbi_docker: latest dcae_docker: 1.1.2 diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index b40f6fbd..4445dd38 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -2130,6 +2130,8 @@ resources: __docker_version__: { get_param: aaf_docker } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __aaf_repo__: { get_param: aaf_repo } + __gerrit_branch__: { get_param: aaf_branch } template: | #!/bin/bash @@ -2144,6 +2146,8 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt + echo "__aaf_repo__" > /opt/config/remote_repo.txt + echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt # Download and run install script curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aaf_install.sh -o /opt/aaf_install.sh diff --git a/heat/ONAP/onap_openstack_light.yaml b/heat/ONAP/onap_openstack_light.yaml index 19819566..17266b25 100644 --- a/heat/ONAP/onap_openstack_light.yaml +++ b/heat/ONAP/onap_openstack_light.yaml @@ -2008,6 +2008,8 @@ resources: __docker_version__: { get_param: aaf_docker } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __aaf_repo__: { get_param: aaf_repo } + __gerrit_branch__: { get_param: aaf_branch } template: | #!/bin/bash @@ -2022,6 +2024,8 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt + echo "__aaf_repo__" > /opt/config/remote_repo.txt + echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt # Download and run install script curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aaf_install.sh -o /opt/aaf_install.sh diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env index f3254c23..475efd7c 100644 --- a/heat/ONAP/onap_openstack_template.env +++ b/heat/ONAP/onap_openstack_template.env @@ -133,6 +133,7 @@ parameters: clamp_branch: master vnfsdk_branch: master music_branch: master + aaf_branch: master aai_docker: ${AAI_RESOURCES_DOCKER} aai_sparky_docker: ${AAI_RESOURCES_DOCKER} @@ -222,3 +223,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 + aaf_repo: http://gerrit.onap.org/r/aaf/authz.git \ No newline at end of file -- cgit 1.2.3-korg