From daa59351a9b39a0bb76a626b699250a52d6f7bc7 Mon Sep 17 00:00:00 2001 From: Eric Debeau Date: Thu, 26 Oct 2017 19:48:36 +0000 Subject: Change DACE by DCAE Change-Id: Ifde0eea9bd45d144dccd1295d837ecdff34b2d43 ISSUE-ID: INT-306 Signed-off-by: Eric Debeau --- heat/ONAP/onap_openstack.env | 30 +++++++++++++++--------------- heat/ONAP/onap_openstack.yaml | 28 ++++++++++++++-------------- 2 files changed, 29 insertions(+), 29 deletions(-) (limited to 'heat') diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 6a1593f5..8a04f453 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -116,21 +116,21 @@ parameters: # dcae_code_version: 1.1.0 - dcaeos_cloud_env: PUT DACE TARGET DEPLOYMENT STACK'S FLAVOR (e.g. OpenStack) HERE - dcaeos_keystone_url: PUT DACE TARGET DEPLOYMENT STACK'S KEYSTONE URL HERE - dcaeos_openstack_region: PUT DACE TARGET DEPLOYMENT STACK'S REGION HERE - dcaeos_openstack_tenant_id: PUT DACE TARGET DEPLOYMENT STACK'S TENANT ID HERE - dcaeos_openstack_username: PUT DACE TARGET DEPLOYMENT STACK'S USERNAME HERE - dcaeos_openstack_password: PUT DACE TARGET DEPLOYMENT STACK'S PASSWORD HERE - dcaeos_dcae_key_name: PUT DACE TARGET DEPLOYMENT STACK'S UPLOADED KEY-PAIR NAME HERE - dcaeos_dcae_pub_key: PUT DACE TARGET DEPLOYMENT STACK'S PUBLIC KEY HERE - dcaeos_private_key: PUT DACE TARGET DEPLOYMENT STACK'S PRIVATE KEY HERE - dcaeos_openstack_private_network_name: PUT DACE TARGET DEPLOYMENT STACK'S INTERNAL NETWOKR ID HERE - dcaeos_public_net_id: PUT DACE TARGET DEPLOYMENT STACK'S PUBLIC NETWORK ID HERE - dcaeos_ubuntu_1604_image: PUT DACE TARGET DEPLOYMENT STACK'S UBUNTU1604 IMAGE ID (TO BE USED BY DCAE VMS) HERE - dcaeos_centos_7_image: PUT DACE TARGET DEPLOYMENT STACK'S CENTOS7 IMAGE ID (TO BE USED BY DCAE VMS) HERE - dcaeos_security_group: PUT DACE TARGET DEPLOYMENT STACK'S SECURITY GROUP ID (TO BE USED BY DCAE VMS) HERE - dcaeos_flavor_id: PUT DACE TARGET DEPLOYMENT STACK'S VM FLAVOR ID (TO BE USED BY DCAE VMS) HERE + dcaeos_cloud_env: PUT DCAE TARGET DEPLOYMENT STACK'S FLAVOR (e.g. OpenStack) HERE + dcaeos_keystone_url: PUT DCAE TARGET DEPLOYMENT STACK'S KEYSTONE URL HERE + dcaeos_openstack_region: PUT DCAE TARGET DEPLOYMENT STACK'S REGION HERE + dcaeos_openstack_tenant_id: PUT DCAE TARGET DEPLOYMENT STACK'S TENANT ID HERE + dcaeos_openstack_username: PUT DCAE TARGET DEPLOYMENT STACK'S USERNAME HERE + dcaeos_openstack_password: PUT DCAE TARGET DEPLOYMENT STACK'S PASSWORD HERE + dcaeos_dcae_key_name: PUT DCAE TARGET DEPLOYMENT STACK'S UPLOADED KEY-PAIR NAME HERE + dcaeos_dcae_pub_key: PUT DCAE TARGET DEPLOYMENT STACK'S PUBLIC KEY HERE + dcaeos_private_key: PUT DCAE TARGET DEPLOYMENT STACK'S PRIVATE KEY HERE + dcaeos_openstack_private_network_name: PUT DCAE TARGET DEPLOYMENT STACK'S INTERNAL NETWOKR ID HERE + dcaeos_public_net_id: PUT DCAE TARGET DEPLOYMENT STACK'S PUBLIC NETWORK ID HERE + dcaeos_ubuntu_1604_image: PUT DCAE TARGET DEPLOYMENT STACK'S UBUNTU1604 IMAGE ID (TO BE USED BY DCAE VMS) HERE + dcaeos_centos_7_image: PUT DCAE TARGET DEPLOYMENT STACK'S CENTOS7 IMAGE ID (TO BE USED BY DCAE VMS) HERE + dcaeos_security_group: PUT DCAE TARGET DEPLOYMENT STACK'S SECURITY GROUP ID (TO BE USED BY DCAE VMS) HERE + dcaeos_flavor_id: PUT DCAE TARGET DEPLOYMENT STACK'S VM FLAVOR ID (TO BE USED BY DCAE VMS) HERE ################################ diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index e897ffdc..7aba53ec 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -222,59 +222,59 @@ parameters: dcaeos_keystone_url: type: string - description: the keystone URL of the OpenStack instance where DACE is deployed + description: the keystone URL of the OpenStack instance where DCAE is deployed dcaeos_openstack_region: type: string - description: the region of the OpenStack instance where DACE is deployed + description: the region of the OpenStack instance where DCAE is deployed dcaeos_openstack_tenant_id: type: string - description: the keystone URL of the OpenStack instance where DACE is deployed + description: the keystone URL of the OpenStack instance where DCAE is deployed dcaeos_openstack_username: type: string - description: the username of the identity API of the OpenStack instance where DACE is deployed + description: the username of the identity API of the OpenStack instance where DCAE is deployed dcaeos_openstack_password: type: string - description: the password of the identity API of the OpenStack instance where DACE is deployed + description: the password of the identity API of the OpenStack instance where DCAE is deployed dcaeos_dcae_key_name: type: string - description: the key-pair name uploaded to the OpenStack instance where DACE is deployed + description: the key-pair name uploaded to the OpenStack instance where DCAE is deployed dcaeos_dcae_pub_key: type: string - description: the public key of the key-pair uploaded to the OpenStack instance where DACE is deployed + description: the public key of the key-pair uploaded to the OpenStack instance where DCAE is deployed dcaeos_private_key: type: string - description: the private key of the key-pair uploaded to the OpenStack instance where DACE is deployed + description: the private key of the key-pair uploaded to the OpenStack instance where DCAE is deployed dcaeos_openstack_private_network_name: type: string - description: the name/id of the network used as DCAE internal network in the OpenStack instance where DACE is deployed + description: the name/id of the network used as DCAE internal network in the OpenStack instance where DCAE is deployed dcaeos_public_net_id: type: string - description: the name/id of the network where DCAE gets floating IPs from in the OpenStack instance where DACE is deployed + description: the name/id of the network where DCAE gets floating IPs from in the OpenStack instance where DCAE is deployed dcaeos_ubuntu_1604_image: type: string - description: the name/id of the Ubuntu1604 VM image in the OpenStack instance where DACE is deployed + description: the name/id of the Ubuntu1604 VM image in the OpenStack instance where DCAE is deployed dcaeos_centos_7_image: type: string - description: the name/id of the CentOS7 VM image in the OpenStack instance where DACE is deployed + description: the name/id of the CentOS7 VM image in the OpenStack instance where DCAE is deployed dcaeos_security_group: type: string - description: the name/id of the security group to be used by DACE VMs in the OpenStack instance where DACE is deployed + description: the name/id of the security group to be used by DCAE VMs in the OpenStack instance where DCAE is deployed dcaeos_flavor_id: type: string - description: the name/id of the VM flavor to be used by DACE VMs in the OpenStack instance where DACE is deployed + description: the name/id of the VM flavor to be used by DCAE VMs in the OpenStack instance where DCAE is deployed # dcae_base_environment: # type: string -- cgit 1.2.3-korg