From 9450cc222df49f3679cb179fdfdc04e22d39fa0b Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Sat, 6 Aug 2016 11:08:05 -0400
Subject: [PATCH] Make deployed-server OS::Neutron::Port optional

This patch makes it possible to set
OS::TripleO::DeployedServer::ControlPlanePort: OS::Heat::None
in your resource_registry and thereby avoid the creation of
a neutron port for the deployed server. This is useful if
you are bootstrapping things in an environment without
Neutron.

Also, includes a new deployed-server-noop-ctlplane.yaml
environment file.

Change-Id: I2990dc816698e0f6e3193a8fc7c9c6767c6e50e5
---
 deployed-server/ctlplane-port.yaml            | 23 +++++++++++++++++++
 deployed-server/deployed-server.yaml          | 13 +++--------
 environments/deployed-server-environment.yaml |  1 +
 .../deployed-server-noop-ctlplane.yaml        |  4 ++++
 4 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 deployed-server/ctlplane-port.yaml
 create mode 100644 environments/deployed-server-noop-ctlplane.yaml

diff --git a/deployed-server/ctlplane-port.yaml b/deployed-server/ctlplane-port.yaml
new file mode 100644
index 0000000000..eb10fba05d
--- /dev/null
+++ b/deployed-server/ctlplane-port.yaml
@@ -0,0 +1,23 @@
+heat_template_version: 2014-10-16
+
+parameters:
+  Hostname:
+    type: string
+
+resources:
+
+  ControlPlanePort:
+    type: OS::Neutron::Port
+    properties:
+      network: ctlplane
+      name:
+        list_join:
+          - '-'
+          - - {get_param: Hostname}
+            - ctlplane
+            - port
+      replacement_policy: AUTO
+
+outputs:
+  ip_address:
+    value: {get_attr: [ControlPlanePort, fixed_ips, 0, ip_address]}
diff --git a/deployed-server/deployed-server.yaml b/deployed-server/deployed-server.yaml
index 8194104718..da5698e5ce 100644
--- 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:
diff --git a/environments/deployed-server-environment.yaml b/environments/deployed-server-environment.yaml
index 3c9e345907..c63d399a02 100644
--- a/environments/deployed-server-environment.yaml
+++ b/environments/deployed-server-environment.yaml
@@ -1,3 +1,4 @@
 resource_registry:
   OS::TripleO::Server: ../deployed-server/deployed-server.yaml
   OS::TripleO::DeployedServerConfig: ../deployed-server/deployed-server-config.yaml
+  OS::TripleO::DeployedServer::ControlPlanePort: ../deployed-server/ctlplane-port.yaml
diff --git a/environments/deployed-server-noop-ctlplane.yaml b/environments/deployed-server-noop-ctlplane.yaml
new file mode 100644
index 0000000000..cfda314d04
--- /dev/null
+++ b/environments/deployed-server-noop-ctlplane.yaml
@@ -0,0 +1,4 @@
+resource_registry:
+  OS::TripleO::Server: ../deployed-server/deployed-server.yaml
+  OS::TripleO::DeployedServerConfig: ../deployed-server/deployed-server-config.yaml
+  OS::TripleO::DeployedServer::ControlPlanePort: OS::Heat::None