Merge "Fix node type names and remove refs to "fake""

5 files changed, 11 insertions, 25 deletions

diff --git a/blueprints/DockerBP.yaml-template b/blueprints/DockerBP.yaml-template
index 000fe58..53aa04b 100644
--- a/blueprints/DockerBP.yaml-template
+++ b/blueprints/DockerBP.yaml-template
@@ -56,9 +56,6 @@ inputs:
   private_net:
     type: string
   openstack: {}
-  fake_designate:
-    type: string
-    default: ''
   keypair:
     type: string
   location_prefix:
@@ -233,10 +230,9 @@ node_templates:
             args:
               floating_network_name: { get_input: public_net }
   dns_dokr00:
-    type: dcae.nodes.dns.arecord
+    type: ccsdk.nodes.dns.arecord
     properties:
       fqdn: { concat: [ { get_input: location_prefix }, { get_input: node_name }, '.', { get_input: location_domain } ] }
-      fakeurl: { get_input: fake_designate }
       openstack: *open_conf
     interfaces:
       cloudify.interfaces.lifecycle:
diff --git a/blueprints/cdapbp7.yaml-template b/blueprints/cdapbp7.yaml-template
index 4480d9a..d9c529b 100644
--- a/blueprints/cdapbp7.yaml-template
+++ b/blueprints/cdapbp7.yaml-template
@@ -45,9 +45,6 @@ inputs:
   private_net:
     type: string
   openstack: {}
-  fake_designate:
-    type: string
-    default: ''
   keypair:
     type: string
   location_prefix:
@@ -152,7 +149,6 @@ node_templates:
     type: ccsdk.nodes.dns.arecord
     properties:
       fqdn: { concat: [ { get_input: location_prefix }, 'cdap00.', { get_input: location_domain } ] }
-      fakeurl: { get_input: fake_designate }
       openstack: *open_conf
     interfaces:
       cloudify.interfaces.lifecycle:
@@ -285,7 +281,6 @@ node_templates:
     type: ccsdk.nodes.dns.arecord
     properties:
       fqdn: { concat: [ { get_input: location_prefix }, 'cdap01.', { get_input: location_domain } ] }
-      fakeurl: { get_input: fake_designate }
       openstack: *open_conf
     interfaces:
       cloudify.interfaces.lifecycle:
@@ -418,7 +413,6 @@ node_templates:
     type: ccsdk.nodes.dns.arecord
     properties:
       fqdn: { concat: [ { get_input: location_prefix }, 'cdap02.', { get_input: location_domain } ] }
-      fakeurl: { get_input: fake_designate }
       openstack: *open_conf
     interfaces:
       cloudify.interfaces.lifecycle:
@@ -555,7 +549,6 @@ node_templates:
     type: ccsdk.nodes.dns.arecord
     properties:
       fqdn: { concat: [ { get_input: location_prefix }, 'cdap03.', { get_input: location_domain } ] }
-      fakeurl: { get_input: fake_designate }
       openstack: *open_conf
     interfaces:
       cloudify.interfaces.lifecycle:
@@ -688,7 +681,6 @@ node_templates:
     type: ccsdk.nodes.dns.arecord
     properties:
       fqdn: { concat: [ { get_input: location_prefix }, 'cdap04.', { get_input: location_domain } ] }
-      fakeurl: { get_input: fake_designate }
       openstack: *open_conf
     interfaces:
       cloudify.interfaces.lifecycle:
@@ -821,7 +813,6 @@ node_templates:
     type: ccsdk.nodes.dns.arecord
     properties:
       fqdn: { concat: [ { get_input: location_prefix }, 'cdap05.', { get_input: location_domain } ] }
-      fakeurl: { get_input: fake_designate }
       openstack: *open_conf
     interfaces:
       cloudify.interfaces.lifecycle:
@@ -954,7 +945,6 @@ node_templates:
     type: ccsdk.nodes.dns.arecord
     properties:
       fqdn: { concat: [ { get_input: location_prefix }, 'cdap06.', { get_input: location_domain } ] }
-      fakeurl: { get_input: fake_designate }
       openstack: *open_conf
     interfaces:
       cloudify.interfaces.lifecycle:
diff --git a/blueprints/pgaas-cluster.yaml-template b/blueprints/pgaas-cluster.yaml-template
index 59b188a..f429566 100644
--- a/blueprints/pgaas-cluster.yaml-template
+++ b/blueprints/pgaas-cluster.yaml-template
@@ -183,7 +183,7 @@ node_templates:
             args:
               floating_network_name: { get_input: public_net }
   dns_pgrs00:
-    type: dcae.nodes.dns.arecord
+    type: ccsdk.nodes.dns.arecord
     properties:
       fqdn: { concat: [ { get_input: location_prefix }, { get_input: pgaas_cluster_name }, '00.', { get_input: location_domain } ] }
       openstack: *open_conf
@@ -285,7 +285,7 @@ node_templates:
             args:
               floating_network_name: { get_input: public_net }
   dns_pgrs01:
-    type: dcae.nodes.dns.arecord
+    type: ccsdk.nodes.dns.arecord
     properties:
       fqdn: { concat: [ { get_input: location_prefix }, { get_input: pgaas_cluster_name }, '01.', { get_input: location_domain } ] }
       openstack: *open_conf
@@ -389,7 +389,7 @@ node_templates:
 
   # CNAME records
   dns_pgrs_rw:
-    type: dcae.nodes.dns.cnamerecord
+    type: ccsdk.nodes.dns.cnamerecord
     properties:
       fqdn: { concat: [ { get_input: location_prefix }, '-', { get_input: pgaas_cluster_name }, '-write.', { get_input: location_domain } ] }
       openstack: *open_conf
@@ -401,7 +401,7 @@ node_templates:
               cname: { concat: [ { get_input: location_prefix }, { get_input: pgaas_cluster_name }, '00.', { get_input: location_domain } ] }
 
   dns_pgrs_ro:
-    type: dcae.nodes.dns.cnamerecord
+    type: ccsdk.nodes.dns.cnamerecord
     properties:
       fqdn: { concat: [ { get_input: location_prefix }, '-', { get_input: pgaas_cluster_name }, '.', { get_input: location_domain } ] }
       openstack: *open_conf
diff --git a/blueprints/pgaas-disk.yaml-template b/blueprints/pgaas-disk.yaml-template
index 7fbe790..0bcd1ac 100644
--- a/blueprints/pgaas-disk.yaml-template
+++ b/blueprints/pgaas-disk.yaml-template
@@ -87,7 +87,7 @@ node_templates:
         get_input: openstack
 
   sharedsshkey_pgrs:
-    type: dcae.nodes.ssh.keypair
+    type: ccsdk.nodes.ssh.keypair
 
   private_net:
     type: cloudify.openstack.nodes.Network
diff --git a/blueprints/pgaas.yaml-template b/blueprints/pgaas.yaml-template
index 16e3496..ea4dac3 100644
--- a/blueprints/pgaas.yaml-template
+++ b/blueprints/pgaas.yaml-template
@@ -155,7 +155,7 @@ node_templates:
       openstack_config: *open_conf
 
   sharedsshkey_pgrs:
-    type: dcae.nodes.ssh.keypair
+    type: ccsdk.nodes.ssh.keypair
 
   fixedip_pgrs00:
     type: cloudify.openstack.nodes.Port
@@ -179,7 +179,7 @@ node_templates:
             args:
               floating_network_name: { get_input: public_net }
   dns_pgrs00:
-    type: dcae.nodes.dns.arecord
+    type: ccsdk.nodes.dns.arecord
     properties:
       fqdn: { concat: [ { get_input: location_prefix }, { get_input: pgaas_cluster_name }, '00.', { get_input: location_domain } ] }
       openstack: *open_conf
@@ -281,7 +281,7 @@ node_templates:
             args:
               floating_network_name: { get_input: public_net }
   dns_pgrs01:
-    type: dcae.nodes.dns.arecord
+    type: ccsdk.nodes.dns.arecord
     properties:
       fqdn: { concat: [ { get_input: location_prefix }, { get_input: pgaas_cluster_name }, '01.', { get_input: location_domain } ] }
       openstack: *open_conf
@@ -364,7 +364,7 @@ node_templates:
 
   # CNAME records
   dns_pgrs_rw:
-    type: dcae.nodes.dns.cnamerecord
+    type: ccsdk.nodes.dns.cnamerecord
     properties:
       fqdn: { concat: [ { get_input: location_prefix }, '-', { get_input: pgaas_cluster_name }, '-write.', { get_input: location_domain } ] }
       openstack: *open_conf
@@ -376,7 +376,7 @@ node_templates:
               cname: { concat: [ { get_input: location_prefix }, { get_input: pgaas_cluster_name }, '00.', { get_input: location_domain } ] }
 
   dns_pgrs_ro:
-    type: dcae.nodes.dns.cnamerecord
+    type: ccsdk.nodes.dns.cnamerecord
     properties:
       fqdn: { concat: [ { get_input: location_prefix }, '-', { get_input: pgaas_cluster_name }, '.', { get_input: location_domain } ] }
       openstack: *open_conf