diff options
| author |   Michael Lando <ml636r@att.com> | 2018-07-31 16:57:03 +0300 |
|---|---|---|
| committer |   Idan Amit <ia096e@intl.att.com> | 2018-07-31 16:09:01 +0000 |
| commit | 7ae629ce867ff4ca5bf038560c7563baa2c6d501 (patch) | |
| tree | d8fd153199b07498387f5eda86e68970a9947a5d | |
| parent | eb736d244351be91e519a11d51217a3183329dd9 (diff) | |
fix yaml alignment issue.
and remove invalide char from normative configuration type
Change-Id: I18ce6b49d310fb46ecde85d47d9eb3bd704bbb5b
Issue-ID: SDC-1577
Signed-off-by: Michael Lando <ml636r@att.com>
3 files changed, 11 insertions, 12 deletions
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.yml b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.yml index 43fceaf535..0d220dc1eb 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.yml @@ -5,14 +5,14 @@ node_types: properties: type: type: string - description: The type of the node, the configuration will be defined for it. Ex.”SBC” + description: The type of the node, the configuration will be defined for it. Ex. SBC required: false role: type: string - description: The role of the node, the configuration will be defined for it. Ex. “Active”, “Standby” + description: The role of the node, the configuration will be defined for it. Ex. Active, Standby required: false function: type: string - description: The function of the node, the configuration will be defined for it. Ex. “NAT Traversal” + description: The function of the node, the configuration will be defined for it. Ex. NAT Traversal required: false diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zip b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zip Binary files differindex cb0d191221..e63971c0ed 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zip +++ b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zip diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb index 90f20192af..0f9719f4ad 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb +++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb @@ -8,15 +8,14 @@ pluginsList: displayName: "Monitoring" displayContext: ["SERVICE"] displayRoles: ["DESIGNER"] - - pluginId: DCAE-DS - pluginDiscoveryUrl: <%= @dcae_dt_discovery_url %> - pluginSourceUrl: <%= @dcae_dt_source_url %> - pluginStateUrl: "dcae-ds" - pluginDisplayOptions: - tab: - displayName: "DCAE-DS" - displayRoles: ["DESIGNER"] - + - pluginId: DCAE-DS + pluginDiscoveryUrl: <%= @dcae_dt_discovery_url %> + pluginSourceUrl: <%= @dcae_dt_source_url %> + pluginStateUrl: "dcae-ds" + pluginDisplayOptions: + tab: + displayName: "DCAE-DS" + displayRoles: ["DESIGNER"] - pluginId: WORKFLOW pluginDiscoveryUrl: <%= @workflow_discovery_url %> pluginSourceUrl: <%= @workflow_source_url %> |