diff options
author | eHanan <eoin.hanan@ericsson.com> | 2018-09-05 14:09:19 +0100 |
---|---|---|
committer | Gary Wu <gary.i.wu@huawei.com> | 2018-09-07 11:02:55 -0700 |
commit | 97b7a9c998bbb8b31b8b04e7eae5d553bbaed738 (patch) | |
tree | 954f9370fa2e0ad828d2fc850b382ef4e3ea972f /deployment/heat/onap-oom/parts | |
parent | 4d2cfb6d4df3f39d299012be1ed8fdb5b1cf460a (diff) |
Deployment Script made more flexible
Change-Id: I8322b85afdd5dfc1a88b7dbf369d3c19399b5b1e
Issue-ID: INT-611
Signed-off-by: eHanan <eoin.hanan@ericsson.com>
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'deployment/heat/onap-oom/parts')
-rw-r--r-- | deployment/heat/onap-oom/parts/onap-oom-1.yaml | 2 | ||||
-rw-r--r-- | deployment/heat/onap-oom/parts/onap-oom-2.yaml | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/deployment/heat/onap-oom/parts/onap-oom-1.yaml b/deployment/heat/onap-oom/parts/onap-oom-1.yaml index 8031505b7..ab79b1ed5 100644 --- a/deployment/heat/onap-oom/parts/onap-oom-1.yaml +++ b/deployment/heat/onap-oom/parts/onap-oom-1.yaml @@ -135,6 +135,8 @@ resources: router: type: OS::Neutron::Router properties: + name: + list_join: ['-', [{ get_param: 'OS::stack_name' }, 'router']] external_gateway_info: network: { get_param: public_net_id } diff --git a/deployment/heat/onap-oom/parts/onap-oom-2.yaml b/deployment/heat/onap-oom/parts/onap-oom-2.yaml index 463635b8a..e01ba132d 100644 --- a/deployment/heat/onap-oom/parts/onap-oom-2.yaml +++ b/deployment/heat/onap-oom/parts/onap-oom-2.yaml @@ -15,7 +15,8 @@ ${K8S_VM_NAME}_vm: type: OS::Nova::Server properties: - name: ${K8S_VM_NAME} + name: + list_join: ['-', [ { get_param: 'OS::stack_name' }, '${K8S_VM_NAME}']] image: { get_param: ubuntu_1604_image } flavor: { get_param: k8s_vm_flavor } key_name: { get_param: key_name } |