summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-06-13 10:23:15 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-06-13 17:25:08 +0000
commit7d9b2c6573ba1874261f8e94d1fec3e1569a6014 (patch)
tree0ce360f1f6d03e56a0c74234debf2682ce444f4c
parent92a14fd3efeb72acd29eeb85a71df0974d7a91a1 (diff)
Remove docker version parameter for AAI sparky
Change-Id: I12239a1f2e3eda97b75b1f68598be3af7b895f16 Issue-ID: INT-529 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r--heat/ONAP/onap_openstack.env1
-rw-r--r--heat/ONAP/onap_openstack.yaml4
-rw-r--r--heat/ONAP/onap_openstack_template.env1
3 files changed, 0 insertions, 6 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index e1775eac..a92c9aeb 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -123,7 +123,6 @@ parameters:
oof_branch: master
aai_docker: 1.2.2
- aai_sparky_docker: 1.2.1
appc_docker: 1.3.0
so_docker: 1.2.2
policy_docker: 1.2.3
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 98848c4f..f9c2528f 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -325,8 +325,6 @@ parameters:
aai_docker:
type: string
- aai_sparky_docker:
- type: string
appc_docker:
type: string
so_docker:
@@ -754,7 +752,6 @@ resources:
__artifacts_version__: { get_param: artifacts_version }
__dns_ip_addr__: { get_param: dns_ip_addr }
__docker_version__: { get_param: aai_docker }
- __aai_sparky_docker__ : { get_param: aai_sparky_docker }
__gerrit_branch__: { get_param: aai_branch }
__cloud_env__: { get_param: cloud_env }
__external_dns__: { get_param: external_dns }
@@ -772,7 +769,6 @@ resources:
echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
echo "__docker_version__" > /opt/config/docker_version.txt
- echo "__aai_sparky_docker__" > /opt/config/sparky_version.txt
echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
echo "aai_instance_1" > /opt/config/aai_instance.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 170ff6e6..f8c9b50f 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -123,7 +123,6 @@ parameters:
oof_branch: master
aai_docker: ${AAI_RESOURCES_DOCKER}
- aai_sparky_docker: ${SPARKY_BE_DOCKER}
appc_docker: ${APPC_IMAGE_DOCKER}
so_docker: ${MSO_DOCKER}
policy_docker: ${POLICY_PE_DOCKER}