[CORD-2349] Migrating REM-CORD
Change-Id: Iae573428e3bee89026262055263f24a32dd12183
diff --git a/roles/cord-profile/templates/openstack.yaml.j2 b/roles/cord-profile/templates/openstack.yaml.j2
index 5f2f233..0159abe 100644
--- a/roles/cord-profile/templates/openstack.yaml.j2
+++ b/roles/cord-profile/templates/openstack.yaml.j2
@@ -19,7 +19,13 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - custom_types/xos.yaml
+ - custom_types/controller.yaml
+ - custom_types/controllersite.yaml
+ - custom_types/deployment.yaml
+ - custom_types/flavor.yaml
+ - custom_types/image.yaml
+ - custom_types/site.yaml
+ - custom_types/sitedeployment.yaml
description: openstack extensions to deployment, generated by platform-install
@@ -31,27 +37,34 @@
{{ image.name }}:
type: tosca.nodes.Image
properties:
- path: /opt/xos/images/{{ image.name }}.qcow2
- disk_format: QCOW2
- container_format: BARE
+ name: {{ image.name }}
+ path: /opt/xos/images/{{ image.name }}.qcow2
+ disk_format: QCOW2
+ container_format: BARE
{% endfor %}
{% for flavor in deployment_flavors %}
{{ flavor }}:
type: tosca.nodes.Flavor
+ properties:
+ name: {{ flavor }}
{% endfor %}
# Deployment - adds images/flavors to site defined in deployment.yaml
+# NOTE do we still need this?
{{ deployment_type }}:
type: tosca.nodes.Deployment
- requirements:
-{% for flavor in deployment_flavors %}
- - {{ flavor }}:
- node: {{ flavor }}
- relationship: tosca.relationships.SupportsFlavor
-{% endfor %}
+ properties:
+ name: {{ deployment_type }}
+# NOTE look that this are outdated and not used anymore
+# requirements:
+# {% for flavor in deployment_flavors %}
+# - {{ flavor }}:
+# node: {{ flavor }}
+# relationship: tosca.relationships.SupportsFlavor
+# {% endfor %}
# OpenStack Controller
{{ site_name }}_{{ deployment_type }}_openstack:
@@ -59,14 +72,15 @@
requirements:
- deployment:
node: {{ deployment_type }}
- relationship: tosca.relationships.ControllerDeployment
+ relationship: tosca.relationships.BelongsToOne
properties:
+ name: {{ site_name }}_{{ deployment_type }}_openstack
backend_type: OpenStack
version: Kilo
- auth_url: { get_script_env: [ SELF, adminrc, OS_AUTH_URL, LOCAL_FILE] }
- admin_user: { get_script_env: [ SELF, adminrc, OS_USERNAME, LOCAL_FILE] }
- admin_password: { get_script_env: [ SELF, adminrc, OS_PASSWORD, LOCAL_FILE] }
- admin_tenant: { get_script_env: [ SELF, adminrc, OS_TENANT_NAME, LOCAL_FILE] }
+ auth_url: https://keystone.{{ site_suffix }}:5000/v2.0
+ admin_user: admin
+ admin_password: {{ keystone_admin_password }}
+ admin_tenant: admin
domain: Default
artifacts:
adminrc: /opt/cord_profile/admin-openrc.sh
@@ -75,14 +89,31 @@
{{ site_name }}:
type: tosca.nodes.Site
properties:
- display_name: {{ site_humanname }}
+ name: {{ site_name }}
+ must-exist: true
site_url: http://{{ site_name }}.opencloud.us/
hosts_nodes: true
- requirements:
- - deployment:
- node: {{ deployment_type }}
- relationship: tosca.relationships.MemberOfDeployment
- - controller:
- node: {{ site_name }}_{{ deployment_type }}_openstack
- relationship: tosca.relationships.UsesController
+
+ {{site_name}}_deployment_{{ deployment_type }}:
+ type: tosca.nodes.SiteDeployment
+ requirements:
+ - site:
+ node: {{ site_name }}
+ relationship: tosca.relationships.BelongsToOne
+ - deployment:
+ node: {{ deployment_type }}
+ relationship: tosca.relationships.BelongsToOne
+ - controller:
+ node: {{ site_name }}_{{ deployment_type }}_openstack
+ relationship: tosca.relationships.BelongsToOne
+
+ {{ site_name }}_openstack_controller:
+ type: tosca.nodes.ControllerSite
+ requirements:
+ - site:
+ node: {{ site_name }}
+ relationship: tosca.relationships.BelongsToOne
+ - controller:
+ node: {{ site_name }}_{{ deployment_type }}_openstack
+ relationship: tosca.relationships.BelongsToOne