Select per-network hostnames for service_node_names

[apex-tripleo-heat-templates.git] / deployed-server / deployed-server.yaml

diff --git a/deployed-server/deployed-server.yaml b/deployed-server/deployed-server.yaml
index 8194104..da5698e 100644 (file)
--- a/deployed-server/deployed-server.yaml
+++ b/deployed-server/deployed-server.yaml
@@ -94,16 +94,9 @@ resources:
       server: {get_resource: deployed-server}
 
   ControlPlanePort:
-    type: OS::Neutron::Port
+    type: OS::TripleO::DeployedServer::ControlPlanePort
     properties:
-      network: ctlplane
-      name:
-        list_join:
-          - '-'
-          - - {get_attr: [HostsEntryDeployment, hostname]}
-            - ctlplane
-            - port
-      replacement_policy: AUTO
+      Hostname: {get_attr: [HostsEntryDeployment, hostname]}
 
 outputs:
   # FIXME(shardy) this is needed because TemplateResource returns an
@@ -113,7 +106,7 @@ outputs:
   networks:
     value:
       ctlplane:
-        - {get_attr: [ControlPlanePort, fixed_ips, 0, ip_address]}
+        - {get_attr: [ControlPlanePort, ip_address]}
   name:
    value: {get_attr: [HostsEntryDeployment, hostname]}
   hosts_entry: