From 7b416393434a53cdb6e5d310b7a648e7bc2b21e5 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Fri, 19 Jan 2018 13:16:49 -0800 Subject: Add windriver env file for OOM heat template Change-Id: I9dfddd4ac3f119243a120db3d20e41871ac91ff5 Issue-ID: INT-381 Signed-off-by: Gary Wu --- deployment/heat/onap-oom/env/gwu/onap.env | 10 ++++- .../heat/onap-oom/env/huawei/onap-beijing-oom.env | 10 ++++- .../onap-oom/env/windriver/Integration-Jenkins.env | 33 ++++++++++++++++ deployment/heat/onap-oom/k8s_vm_entrypoint.sh | 17 ++++---- deployment/heat/onap-oom/onap-oom.yaml | 45 +++++++++++++++++++--- 5 files changed, 100 insertions(+), 15 deletions(-) create mode 100644 deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env (limited to 'deployment') diff --git a/deployment/heat/onap-oom/env/gwu/onap.env b/deployment/heat/onap-oom/env/gwu/onap.env index 1f3b9e5d7..6c03e947e 100644 --- a/deployment/heat/onap-oom/env/gwu/onap.env +++ b/deployment/heat/onap-oom/env/gwu/onap.env @@ -19,7 +19,15 @@ parameters: public_net_id: 024582bd-ef9b-48b9-9e70-e6732559d9df public_net_name: provider + dcae_keystone_url: http://192.168.1.11:5000/v2.0 oam_network_cidr: 172.16.0.0/16 dcae_ip_addr: 172.16.0.4 - dns_list: ["192.168.1.11", "192.168.1.3"] dns_forwarder: 192.168.1.11 + external_dns: 192.168.1.3 + + dnsaas_proxy_enable: false + dnsaas_keystone_url: http://192.168.1.11:5000/v2.0 + dnsaas_region: RegionOne + dnsaas_tenant_name: onap + dnsaas_username: demo + dnsaas_password: demo diff --git a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env index 00f3bd2cb..0810cb598 100644 --- a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env +++ b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env @@ -19,7 +19,15 @@ parameters: public_net_id: 3a6247f1-fac6-4167-a49f-33cc8415ccf4 public_net_name: provider + dcae_keystone_url: http://10.145.122.117:5000/v2.0 oam_network_cidr: 172.16.0.0/16 dcae_ip_addr: 172.16.0.4 - dns_list: ["10.145.122.117", "10.145.122.118"] dns_forwarder: 10.145.122.117 + external_dns: 10.145.122.118 + + dnsaas_proxy_enable: false + dnsaas_keystone_url: http://10.145.122.117:5000/v2.0 + dnsaas_region: RegionOne + dnsaas_tenant_name: onap-beijing-oom + dnsaas_username: demo + dnsaas_password: demo diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env new file mode 100644 index 000000000..da01dce47 --- /dev/null +++ b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env @@ -0,0 +1,33 @@ +parameters: + + keystone_url: http://10.12.25.2:5000 + openstack_tenant_id: 09d8566ea45e43aa974cf447ed591d77 + openstack_tenant_name: Integration-Jenkins + openstack_username: demo + openstack_api_key: onapdemo + + ubuntu_1404_image: ubuntu-14-04-cloud-amd64 + ubuntu_1604_image: ubuntu-16-04-cloud-amd64 + centos_7_image: CentOS-7 + + apt_proxy: http://10.12.5.80:3142 + docker_proxy: 10.12.5.80:5000 + + rancher_vm_flavor: m1.small + k8s_vm_flavor: m1.xxlarge + + public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4 + public_net_name: external + + dcae_keystone_url: "http://10.0.14.1/api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0" + oam_network_cidr: 10.0.0.0/16 + dcae_ip_addr: 10.0.4.1 + dns_forwarder: 10.12.25.5 + external_dns: 8.8.8.8 + + dnsaas_proxy_enable: true + dnsaas_keystone_url: http://10.12.25.5:5000/v2.0 + dnsaas_region: RegionOne + dnsaas_tenant_name: Integration-Jenkins + dnsaas_username: demo + dnsaas_password: onapdemo diff --git a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh index cae0f392b..db2428ba9 100644 --- a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh +++ b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh @@ -145,15 +145,16 @@ OPENSTACK_USERNAME: "__openstack_username__" OPENSTACK_API_KEY: "__openstack_api_key__" OPENSTACK_KEYSTONE_URL: "__keystone_url__" DCAE_IP_ADDR: "__dcae_ip_addr__" -DCAE_KEYSTONE_URL: "__keystone_url__/v2.0" -DNS_LIST: "__dns_list__" +DCAE_KEYSTONE_URL: "__dcae_keystone_url__" +DNS_LIST: "__dns_forwarder__" DNS_FORWARDER: "__dns_forwarder__" -EXTERNAL_DNS: "8.8.8.8" -DNSAAS_REGION: "RegionOne" -DNSAAS_KEYSTONE_URL: "__keystone_url__/v2.0" -DNSAAS_TENANT_NAME: "__openstack_tenant_name__" -DNSAAS_USERNAME: "__openstack_username__" -DNSAAS_PASSWORD: "__openstack_api_key__" +EXTERNAL_DNS: "__external_dns__" +DNSAAS_PROXY_ENABLE: "__dnsaas_proxy_enable__" +DNSAAS_KEYSTONE_URL: "__dnsaas_keystone_url__" +DNSAAS_REGION: "__dnsaas_region__" +DNSAAS_TENANT_NAME: "__dnsaas_tenant_name__" +DNSAAS_USERNAME: "__dnsaas_username__" +DNSAAS_PASSWORD: "__dnsaas_password__" EOF cat ~/oom/kubernetes/config/onap-parameters.yaml diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml index 5db534471..ee16ffc1d 100644 --- a/deployment/heat/onap-oom/onap-oom.yaml +++ b/deployment/heat/onap-oom/onap-oom.yaml @@ -16,10 +16,6 @@ parameters: type: string description: The name of the Public network referred by public_net_id - dns_list: - type: comma_delimited_list - description: List of External DNS for OAM ONAP network - oam_network_cidr: type: string description: CIDR of the OAM ONAP network @@ -71,6 +67,37 @@ parameters: type: string description: the forwarder address for setting up ONAP's private DNS server + external_dns: + type: string + description: Public IP of the external DNS for ONAP network + + dnsaas_proxy_enable: + type: string + description: whether to enable DNSaaS proxy via multicloud + + dnsaas_region: + type: string + description: the region of the cloud instance providing the Designate DNS as a Service + + dnsaas_keystone_url: + type: string + description: the keystone URL of the cloud instance providing the Designate DNS as a Service + + dnsaas_username: + type: string + description: the username of the cloud instance providing the Designate DNS as a Service + + dnsaas_password: + type: string + description: the password of the cloud instance providing the Designate DNS as a Service + + dnsaas_tenant_name: + type: string + description: the name of the tenant in the cloud instance providing the Designate DNS as a Service + + dcae_keystone_url: + type: string + description: the keystone URL for DCAE to use (via MultiCloud) resources: random-str: @@ -123,8 +150,16 @@ resources: __ubuntu_1604_image__: { get_param: ubuntu_1604_image } __centos_7_image__: { get_param: centos_7_image } __keystone_url__: { get_param: keystone_url } + __dcae_keystone_url__: { get_param: dcae_keystone_url } __dcae_ip_addr__: { get_param: dcae_ip_addr } - __dns_list__: { get_param: [dns_list, 0] } __dns_forwarder__: { get_param: dns_forwarder } + __external_dns__: { get_param: external_dns } + __dnsaas_proxy_enable__: { get_param: dnsaas_proxy_enable } + __dnsaas_keystone_url__: { get_param: dnsaas_keystone_url } + __dnsaas_region__: { get_param: dnsaas_region } + __dnsaas_tenant_name__: { get_param: dnsaas_tenant_name } + __dnsaas_username__: { get_param: dnsaas_username } + __dnsaas_password__: { get_param: dnsaas_password } template: get_file: k8s_vm_entrypoint.sh + -- cgit 1.2.3-korg