summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--boot/so_vm_init.sh2
-rw-r--r--heat/ONAP/onap_openstack.yaml10
-rw-r--r--heat/ONAP/onap_openstack_float.yaml2
-rw-r--r--heat/ONAP/onap_openstack_nofloat.yaml2
-rw-r--r--heat/ONAP/onap_rackspace.yaml2
5 files changed, 11 insertions, 7 deletions
diff --git a/boot/so_vm_init.sh b/boot/so_vm_init.sh
index d767a149..c6886011 100644
--- a/boot/so_vm_init.sh
+++ b/boot/so_vm_init.sh
@@ -76,7 +76,7 @@ read -d '' MSO_CONFIG_UPDATES <<-EOF
"identity_services":
[
{"dcp_clli": "$DCP_CLLI",
- "identity_url": "$KEYSTONE_URL",
+ "identity_url": "$KEYSTONE_URL/v2.0",
"mso_id": "$OPENSTACK_USERNAME",
"mso_pass": "$OPENSTACK_APIKEY",
"admin_tenant": "service",
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 242d0dd2..70bbca2e 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -3,7 +3,7 @@
#==================LICENSE_START==========================================
#
#
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -862,6 +862,8 @@ resources:
__external_dns__: { get_param: external_dns }
__vm_image_name__: { get_param: ubuntu_1404_image }
__vm_flavor__: { get_param: flavor_medium }
+ __public_net_id__: { get_param: public_net_id }
+ __script_version__: { get_param: artifact_version }
__robot_repo__: { get_param: robot_repo }
template: |
#!/bin/bash
@@ -899,6 +901,8 @@ resources:
echo "__external_dns__" > /opt/config/external_dns.txt
echo "__vm_image_name__" > /opt/config/vm_image_name.txt
echo "__vm_flavor__" > /opt/config/vm_flavor.txt
+ echo "__script_version__" > /opt/config/script_version.txt
+ echo "__public_net_id__" > /opt/config/public_net_id.txt
echo "__robot_repo__" > /opt/config/remote_repo.txt
# Download and run install script
@@ -1563,7 +1567,7 @@ resources:
flavor: { get_param: flavor_xxlarge }
name:
str_replace:
- template: base-openo-server
+ template: base-multi-service
params:
base: { get_param: vm_base_name }
key_name: { get_resource: vm_key }
@@ -1670,7 +1674,7 @@ resources:
flavor: { get_param: flavor_medium }
name:
str_replace:
- template: base-dcae-controller
+ template: base-dcae-bootstrap
params:
base: { get_param: vm_base_name }
key_name: { get_resource: dcae_vm_key }
diff --git a/heat/ONAP/onap_openstack_float.yaml b/heat/ONAP/onap_openstack_float.yaml
index 46c49033..01f160ab 100644
--- a/heat/ONAP/onap_openstack_float.yaml
+++ b/heat/ONAP/onap_openstack_float.yaml
@@ -3,7 +3,7 @@
#==================LICENSE_START==========================================
#
#
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/heat/ONAP/onap_openstack_nofloat.yaml b/heat/ONAP/onap_openstack_nofloat.yaml
index 3ebd37ec..136b1606 100644
--- a/heat/ONAP/onap_openstack_nofloat.yaml
+++ b/heat/ONAP/onap_openstack_nofloat.yaml
@@ -3,7 +3,7 @@
#==================LICENSE_START==========================================
#
#
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/heat/ONAP/onap_rackspace.yaml b/heat/ONAP/onap_rackspace.yaml
index ab565550..a73053f2 100644
--- a/heat/ONAP/onap_rackspace.yaml
+++ b/heat/ONAP/onap_rackspace.yaml
@@ -3,7 +3,7 @@
#==================LICENSE_START==========================================
#
#
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.