Merge "Fix deployment errors in nbi cloud init"

author Gary Wu <gary.i.wu@huawei.com>

Tue, 17 Apr 2018 15:32:19 +0000 (15:32 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Tue, 17 Apr 2018 15:32:19 +0000 (15:32 +0000)
author Gary Wu <gary.i.wu@huawei.com>
Tue, 17 Apr 2018 15:32:19 +0000 (15:32 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Tue, 17 Apr 2018 15:32:19 +0000 (15:32 +0000)
diff --cc heat/ONAP/onap_openstack.yaml
Simple merge
author	Gary Wu <gary.i.wu@huawei.com>
	Tue, 17 Apr 2018 15:32:19 +0000 (15:32 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Tue, 17 Apr 2018 15:32:19 +0000 (15:32 +0000)