diff options
| author |   Marco Platania <platania@research.att.com> | 2018-04-16 14:44:15 -0400 |
|---|---|---|
| committer | Marco Platania <platania@research.att.com> | 2018-04-16 14:44:15 -0400 |
| commit | 87ff9f85c1c270a9b8533918701fa920a181d750 (patch) | |
| tree | be1b127329f181941c75cfe35305dbcd5b34bb54 /heat/ONAP | |
| parent | a310c917999db3edfb2eba58485d674ae8b35547 (diff) | |
Update AAF installation with Heat
Change-Id: I169e2b6530b5515879c6ebdcf6b1ebf2b3f83aa1
Issue-ID: INT-444
Signed-off-by: Marco Platania <platania@research.att.com>
Diffstat (limited to 'heat/ONAP')
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 2 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 8 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_light.yaml | 6 |
3 files changed, 13 insertions, 3 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 329b677c..8ed1986e 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -134,6 +134,7 @@ parameters: vnfsdk_branch: master music_branch: master nbi_branch: master + aaf_branch: master aai_docker: 1.2-STAGING-latest aai_sparky_docker: 1.2-STAGING-latest @@ -224,3 +225,4 @@ parameters: 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 + aaf_repo: http://gerrit.onap.org/r/aaf/authz.git
\ No newline at end of file diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 4445dd38..c5ffdaff 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -298,6 +298,8 @@ parameters: type: string nbi_repo: type: string + aaf_repo: + type: string ################################ # # @@ -493,6 +495,8 @@ parameters: type: string nbi_branch: type: string + aaf_branch: + type: string ############# # # @@ -1860,7 +1864,7 @@ resources: __dcae_ph_docker__: { get_param: dcae_ph_docker } __dcae_sch_docker__: { get_param: dcae_sch_docker } __dcae_heartbeat_docker__: { get_param: dcae_heartbeat_docker } - __dcae_prh_docker__: { get_param: dcaeprh_docker } + __dcae_prh_docker__: { get_param: dcae_prh_docker } __holmes_em_docker__: { get_param: holmes_em_docker } __holmes_rm_docker__: { get_param: holmes_rm_docker } @@ -2107,7 +2111,7 @@ resources: aaf_vm: type: OS::Nova::Server properties: - image: { get_param: ubuntu_1404_image } + image: { get_param: ubuntu_1604_image } flavor: { get_param: flavor_medium } name: str_replace: diff --git a/heat/ONAP/onap_openstack_light.yaml b/heat/ONAP/onap_openstack_light.yaml index 17266b25..79fffad9 100644 --- a/heat/ONAP/onap_openstack_light.yaml +++ b/heat/ONAP/onap_openstack_light.yaml @@ -294,6 +294,8 @@ parameters: type: string nbi_repo: type: string + aaf_repo: + type: string ################################ # # @@ -416,6 +418,8 @@ parameters: type: string nbi_branch: type: string + aaf_branch: + type: string ############# # # @@ -1985,7 +1989,7 @@ resources: aaf_vm: type: OS::Nova::Server properties: - image: { get_param: ubuntu_1404_image } + image: { get_param: ubuntu_1604_image } flavor: { get_param: flavor_medium } name: str_replace: |