diff options
Diffstat (limited to 'heat/ONAP')
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 1 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 4 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_float.env | 1 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_float.yaml | 4 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_nofloat.env | 1 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_nofloat.yaml | 11 |
6 files changed, 16 insertions, 6 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index f199cba5..189dfd27 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -161,6 +161,7 @@ parameters: mvim_docker: latest vfc_docker: latest uui_docker: latest + esr_docker: latest dgbuilder_docker: 0.1-STAGING-latest cli_docker: 1.1-STAGING-latest diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 21accaa5..e8e44a0c 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -331,6 +331,8 @@ parameters: type: string uui_docker: type: string + esr_docker: + type: string dgbuilder_docker: type: string cli_docker: @@ -1600,6 +1602,7 @@ resources: __mvim_docker__: { get_param: mvim_docker } __vfc_docker__: { get_param: vfc_docker } __uui_docker__: { get_param: uui_docker } + __esr_docker__: { get_param: esr_docker } __vnfsdk_repo__: { get_param: vnfsdk_repo } template: | #!/bin/bash @@ -1620,6 +1623,7 @@ resources: echo "__mvim_docker__" > /opt/config/mvim_docker.txt echo "__vfc_docker__" > /opt/config/vfc_docker.txt echo "__uui_docker__" > /opt/config/uui_docker.txt + echo "__esr_docker__" > /opt/config/esr_docker.txt echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt # Create env file with the IP address of all ONAP components diff --git a/heat/ONAP/onap_openstack_float.env b/heat/ONAP/onap_openstack_float.env index 976805a2..e970b7f4 100644 --- a/heat/ONAP/onap_openstack_float.env +++ b/heat/ONAP/onap_openstack_float.env @@ -182,6 +182,7 @@ parameters: mvim_docker: latest vfc_docker: latest uui_docker: latest + esr_docker: latest dgbuilder_docker: 0.1-STAGING-latest cli_docker: 1.1-STAGING-latest diff --git a/heat/ONAP/onap_openstack_float.yaml b/heat/ONAP/onap_openstack_float.yaml index 010d44cd..46c49033 100644 --- a/heat/ONAP/onap_openstack_float.yaml +++ b/heat/ONAP/onap_openstack_float.yaml @@ -374,6 +374,8 @@ parameters: type: string uui_docker: type: string + esr_docker: + type: string dgbuilder_docker: type: string cli_docker: @@ -1661,6 +1663,7 @@ resources: __mvim_docker__: { get_param: mvim_docker } __vfc_docker__: { get_param: vfc_docker } __uui_docker__: { get_param: uui_docker } + __esr_docker__: { get_param: esr_docker } __vnfsdk_repo__: { get_param: vnfsdk_repo } template: | #!/bin/bash @@ -1681,6 +1684,7 @@ resources: echo "__mvim_docker__" > /opt/config/mvim_docker.txt echo "__vfc_docker__" > /opt/config/vfc_docker.txt echo "__uui_docker__" > /opt/config/uui_docker.txt + echo "__esr_docker__" > /opt/config/esr_docker.txt echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt # Create env file with the IP address of all ONAP components diff --git a/heat/ONAP/onap_openstack_nofloat.env b/heat/ONAP/onap_openstack_nofloat.env index 6bf5e806..1b9cbd91 100644 --- a/heat/ONAP/onap_openstack_nofloat.env +++ b/heat/ONAP/onap_openstack_nofloat.env @@ -154,6 +154,7 @@ parameters: mvim_docker: latest vfc_docker: latest uui_docker: latest + esr_docker: latest dgbuilder_docker: 0.1-STAGING-latest cli_docker: 1.1-STAGING-latest diff --git a/heat/ONAP/onap_openstack_nofloat.yaml b/heat/ONAP/onap_openstack_nofloat.yaml index f48a80b5..3ebd37ec 100644 --- a/heat/ONAP/onap_openstack_nofloat.yaml +++ b/heat/ONAP/onap_openstack_nofloat.yaml @@ -318,6 +318,8 @@ parameters: type: string uui_docker: type: string + esr_docker: + type: string dgbuilder_docker: type: string cli_docker: @@ -1531,6 +1533,7 @@ resources: __mvim_docker__: { get_param: mvim_docker } __vfc_docker__: { get_param: vfc_docker } __uui_docker__: { get_param: uui_docker } + __esr_docker__: { get_param: esr_docker } __vnfsdk_repo__: { get_param: vnfsdk_repo } template: | #!/bin/bash @@ -1551,6 +1554,7 @@ resources: echo "__mvim_docker__" > /opt/config/mvim_docker.txt echo "__vfc_docker__" > /opt/config/vfc_docker.txt echo "__uui_docker__" > /opt/config/uui_docker.txt + echo "__esr_docker__" > /opt/config/esr_docker.txt echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt # Create env file with the IP address of all ONAP components @@ -1584,12 +1588,6 @@ resources: network: { get_resource: oam_onap } fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}] - dcae_c_floating_ip: - type: OS::Neutron::FloatingIP - properties: - floating_network_id: { get_param: public_net_id } - port_id: { get_resource: dcae_c_private_port } - dcae_c_vm: type: OS::Nova::Server properties: @@ -1602,6 +1600,7 @@ resources: base: { get_param: vm_base_name } key_name: { get_resource: dcae_vm_key } networks: + - network: { get_param: public_net_id } - port: { get_resource: dcae_c_private_port } user_data_format: RAW user_data: |