summaryrefslogtreecommitdiffstats
path: root/heat/OpenECOMP/onap_openstack_RC.yaml
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2017-04-21 10:26:14 -0400
committerMarco Platania <platania@research.att.com>2017-04-21 10:26:14 -0400
commit98c0e04a7ebd572e17b2aaa80c6acaaf13535e9d (patch)
tree4627cac1998226893db5161b107833f483809e15 /heat/OpenECOMP/onap_openstack_RC.yaml
parent9c0bf79a00b52ed75fa1edc292eea87ad5846c78 (diff)
Remove AAI dependency on SDC form Heat
Change-Id: I92b34360849518cff3dc904564e732836396cfd5 Signed-off-by: Marco Platania <platania@research.att.com>
Diffstat (limited to 'heat/OpenECOMP/onap_openstack_RC.yaml')
-rw-r--r--heat/OpenECOMP/onap_openstack_RC.yaml13
1 files changed, 6 insertions, 7 deletions
diff --git a/heat/OpenECOMP/onap_openstack_RC.yaml b/heat/OpenECOMP/onap_openstack_RC.yaml
index 6ec6f7af..6a296d22 100644
--- a/heat/OpenECOMP/onap_openstack_RC.yaml
+++ b/heat/OpenECOMP/onap_openstack_RC.yaml
@@ -298,12 +298,12 @@ resources:
vm_key:
type: OS::Nova::KeyPair
properties:
- name:
+ name:
str_replace:
template: base_rand
params:
base: { get_param: key_name }
- rand: { get_resource: random-str }
+ rand: { get_resource: random-str }
public_key: { get_param: pub_key }
save_private_key: false
@@ -312,7 +312,7 @@ resources:
oam_ecomp:
type: OS::Neutron::Net
properties:
- name:
+ name:
str_replace:
template: oam_ecomp_rand
params:
@@ -321,7 +321,7 @@ resources:
oam_ecomp_subnet:
type: OS::Neutron::Subnet
properties:
- name:
+ name:
str_replace:
template: oam_ecomp_rand
params:
@@ -438,7 +438,6 @@ resources:
aai_vm:
type: OS::Nova::Server
- depends_on: sdc_vm
properties:
image: { get_param: ubuntu_1404_image }
flavor: { get_param: flavor_xlarge }
@@ -534,7 +533,7 @@ resources:
#!/bin/bash
# Create configuration files
- mkdir -p /opt/config
+ mkdir -p /opt/config
echo "__nexus_repo__" > /opt/config/nexus_repo.txt
echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
echo "__nexus_username__" > /opt/config/nexus_username.txt
@@ -984,7 +983,7 @@ resources:
networks:
- port: { get_resource: dcae_c_private_port }
user_data_format: RAW
- user_data:
+ user_data:
str_replace:
params:
__nexus_repo__: { get_param: nexus_repo }