CORD-2964 Tosca changes for OpenStack Modeling Changes;
Enable Pull Steps and Models directories;
Add OpenStack synchronizer to filter-images

Change-Id: I324afbcf542ba907decb9b0907dc18354be61249
diff --git a/xos-services/openstack/templates/_tosca.tpl b/xos-services/openstack/templates/_tosca.tpl
index a2fdd94..8f00dad 100644
--- a/xos-services/openstack/templates/_tosca.tpl
+++ b/xos-services/openstack/templates/_tosca.tpl
@@ -126,6 +126,7 @@
   - custom_types/deployment.yaml
   - custom_types/site.yaml
   - custom_types/sitedeployment.yaml
+  - custom_types/openstackservice.yaml
 
 description: openstack controller models
 
@@ -144,6 +145,15 @@
         name: {{ .cordDeploymentName }}
         must-exist: true
 
+    service#openstack:
+      type: tosca.nodes.OpenStackService
+      properties:
+          name: "OpenStack"
+          auth_url: http://keystone.openstack.svc.cluster.local/v3
+          admin_user: {{ .keystoneAdminUser }}
+          admin_password: {{ .keystoneAdminPassword }}
+          admin_tenant: {{ .keystoneAdminTenant }}
+
     {{ .cordSiteName }}_{{ .cordDeploymentName }}_openstack:
       type: tosca.nodes.Controller
       requirements: