summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLusheng Ji <lji@research.att.com>2017-10-25 21:06:10 -0400
committerLusheng Ji <lji@research.att.com>2017-10-26 02:36:29 +0000
commita3069b261d1e029f32d77f6aa8e78478f1354b21 (patch)
treee512315183b19f0ac3c2306306867c6e85ba94eb
parente844f8546761abb71c125bac08022cdc5671405c (diff)
Fix text substitution keyname typo
Also write priv key file replacing \n with linei break Issue-Id: DCAEGEN2-127 Change-Id: I2090fd074c12eb3b5c98dbd58353e3b9960088bf Signed-off-by: Lusheng Ji <lji@research.att.com>
-rw-r--r--boot/dcae2_install.sh2
-rw-r--r--heat/ONAP/onap_openstack.yaml30
2 files changed, 16 insertions, 16 deletions
diff --git a/boot/dcae2_install.sh b/boot/dcae2_install.sh
index 59c8e5ed..a03e30bd 100644
--- a/boot/dcae2_install.sh
+++ b/boot/dcae2_install.sh
@@ -76,7 +76,7 @@ mkdir -p /opt/app/config
# private key
-cp /opt/config/priv_key /opt/app/config/key
+sed -e 's/\\n/\n/g' /opt/config/priv_key | sed -e 's/^[ \t]*//g; s/[ \t]*$//g' > /opt/app/config/key
chmod 777 /opt/app/config/key
# move keystone url file
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 1f4fb91c..e897ffdc 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -1756,27 +1756,27 @@ resources:
__sdc_ip_addr__: { get_param: sdc_ip_addr }
# floating IPs
__dns_floating_ip_addr__: { get_attr: [dns_floating_ip, floating_ip_address] }
- __aai1_floating_ip_addr___: { get_attr: [aai1_floating_ip, floating_ip_address] }
- __aai2_floating_ip_addr___: { get_attr: [aai2_floating_ip, floating_ip_address] }
- __so_floating_ip_addr___: { get_attr: [so_floating_ip, floating_ip_address] }
- __mrouter_floating_ip_addr___: { get_attr: [mrouter_floating_ip, floating_ip_address] }
- __robot_floating_ip_addr___: { get_attr: [robot_floating_ip, floating_ip_address] }
- __vid_floating_ip_addr___: { get_attr: [vid_floating_ip, floating_ip_address] }
- __sdnc_floating_ip_addr___: { get_attr: [sdnc_floating_ip, floating_ip_address] }
- __sdc_floating_ip_addr___: { get_attr: [sdc_floating_ip, floating_ip_address] }
- __portal_floating_ip_addr___: { get_attr: [portal_floating_ip, floating_ip_address] }
- __policy_floating_ip_addr___: { get_attr: [policy_floating_ip, floating_ip_address] }
- __appc_floating_ip_addr___: { get_attr: [appc_floating_ip, floating_ip_address] }
- __clamp_floating_ip_addr___: { get_attr: [clamp_floating_ip, floating_ip_address] }
- __openo_floating_ip_addr___: { get_attr: [openo_floating_ip, floating_ip_address] }
- __dcae_c_floating_ip_addr___: { get_attr: [dcae_c_floating_ip, floating_ip_address] }
+ __aai1_floating_ip_addr__: { get_attr: [aai1_floating_ip, floating_ip_address] }
+ __aai2_floating_ip_addr__: { get_attr: [aai2_floating_ip, floating_ip_address] }
+ __so_floating_ip_addr__: { get_attr: [so_floating_ip, floating_ip_address] }
+ __mrouter_floating_ip_addr__: { get_attr: [mrouter_floating_ip, floating_ip_address] }
+ __robot_floating_ip_addr__: { get_attr: [robot_floating_ip, floating_ip_address] }
+ __vid_floating_ip_addr__: { get_attr: [vid_floating_ip, floating_ip_address] }
+ __sdnc_floating_ip_addr__: { get_attr: [sdnc_floating_ip, floating_ip_address] }
+ __sdc_floating_ip_addr__: { get_attr: [sdc_floating_ip, floating_ip_address] }
+ __portal_floating_ip_addr__: { get_attr: [portal_floating_ip, floating_ip_address] }
+ __policy_floating_ip_addr__: { get_attr: [policy_floating_ip, floating_ip_address] }
+ __appc_floating_ip_addr__: { get_attr: [appc_floating_ip, floating_ip_address] }
+ __clamp_floating_ip_addr__: { get_attr: [clamp_floating_ip, floating_ip_address] }
+ __openo_floating_ip_addr__: { get_attr: [openo_floating_ip, floating_ip_address] }
+ __dcae_c_floating_ip_addr__: { get_attr: [dcae_c_floating_ip, floating_ip_address] }
template: |
#!/bin/bash
# Create configuration files
mkdir -p /opt/config
- echo "__dcae_zone__" > /opt/config/dcae_zone.txt
+ echo "__rand_str__" > /opt/config/dcae_zone.txt
echo "__rand_str__" > /opt/config/rand_str.txt
# repo related
echo "__docker_version__" > /opt/config/docker_version.txt