aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--heat/ONAP/onap_openstack.env30
-rw-r--r--heat/ONAP/onap_openstack.yaml28
2 files changed, 29 insertions, 29 deletions
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
#aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ } 
<!--
  ============LICENSE_START=======================================================
  events in model-impl
  ================================================================================
  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.
  You may obtain a copy of the License at
  
       http://www.apache.org/licenses/LICENSE-2.0
  
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
  ============LICENSE_END=========================================================
  -->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>

  <parent>
    <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
    <artifactId>model-impl</artifactId>
    <version>1.2.0-SNAPSHOT</version>
  </parent>

  <artifactId>events</artifactId>

  <dependencies>
    <dependency>
      <groupId>com.google.code.gson</groupId>
      <artifactId>gson</artifactId>
      <version>2.5</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <version>4.12</version>
      <scope>test</scope>
    </dependency>
  </dependencies>
  
  <build>
    <plugins>
      <plugin>
        <artifactId>maven-checkstyle-plugin</artifactId>
        <executions>
          <execution>
            <id>onap-java-style</id>
            <goals>
              <goal>check</goal>
            </goals>
            <phase>process-sources</phase>
            <configuration>
              <!-- Use Google Java Style Guide:
              https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
              with minor changes -->
              <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
              <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
              <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
              <includeResources>true</includeResources>
              <includeTestSourceDirectory>true</includeTestSourceDirectory>
              <includeTestResources>true</includeTestResources>
              <excludes>
              </excludes>
              <consoleOutput>true</consoleOutput>
              <failOnViolation>true</failOnViolation>
              <violationSeverity>warning</violationSeverity>
            </configuration>
          </execution>
        </executions>
        <dependencies>
          <dependency>
            <groupId>org.onap.oparent</groupId>
            <artifactId>checkstyle</artifactId>
            <version>0.1.1</version>
            <scope>compile</scope>
          </dependency>
        </dependencies>
      </plugin>
    </plugins>
  </build>
</project>