Merge pull request #13 from steveb/create_private

Create private

templates/env.yaml.example

@@ -32,3 +32,7 @@ parameters:
 # Uncomment the following to use no floating ip
 # resource_registry:
 #  OS::OVB::UndercloudFloating: templates/undercloud-floating-none.yaml
+
+# Uncomment the following to create a private network
+# resource_registry:
+#  OS::OVB::PrivateNetwork: templates/private-net-create.yaml

templates/private-net-create.yaml

@@ -0,0 +1,48 @@
+heat_template_version: 2015-04-30
+
+# Template which creates a private network which is routed to an external
+# network.
+
+parameters:
+  external_net:
+    type: string
+    description: An external network for the private network to route to
+
+  private_net:
+    type: string
+    description: Name of private network
+
+  private_net_cidr:
+    type: string
+    description: CIDR for private network subnet
+    default: 10.0.1.0/24
+
+resources:
+
+  network:
+    type: OS::Neutron::Net
+    properties:
+      name: {get_param: private_net}
+
+  subnet:
+    type: OS::Neutron::Subnet
+    properties:
+      network: {get_resource: network}
+      name: {get_param: private_net}
+      cidr: {get_param: private_net_cidr}
+
+  router:
+    type: OS::Neutron::Router
+    properties:
+      external_gateway_info:
+        network: {get_param: external_net}
+
+  router_interface:
+    type: OS::Neutron::RouterInterface
+    properties:
+      router: {get_resource: router}
+      subnet: {get_resource: subnet}
+
+outputs:
+  private_net:
+    value: {get_param: private_net}

templates/private-net-existing.yaml

@@ -0,0 +1,18 @@
+heat_template_version: 2015-04-30
+
+# Template which provides a private network which is routed to an external
+# network. This template just passes through the name of an already created
+# private network.
+
+parameters:
+  external_net:
+    type: string
+    description: An external network from which floating ips can be provisioned
+
+  private_net:
+    type: string
+    description: Name of private network
+
+outputs:
+  private_net:
+    value: {get_param: private_net}

templates/quintupleo.yaml

@@ -143,6 +143,12 @@ resources:
       - protocol: tcp
       - protocol: udp
 
+  private_network:
+    type: OS::OVB::PrivateNetwork
+    properties:
+      external_net: {get_param: external_net}
+      private_net: {get_param: private_net}
+
   undercloud_server:
     type: OS::Nova::Server
     properties:
@@ -154,7 +160,7 @@ resources:
       - {get_resource: all_sg}
       - {get_resource: all_sg}
       networks:
-      - network: {get_param: private_net}
+      - network: {get_attr: [private_network, private_net]}
       - network: {get_resource: provision_network}
       - network: {get_resource: public_network}
       name: {get_param: undercloud_name}
@@ -165,7 +171,13 @@ resources:
     type: OS::OVB::UndercloudFloating
     properties:
       external_net: {get_param: external_net}
-      undercloud_port: {get_attr: [undercloud_server, addresses, {get_param: private_net}, 0, port]}
+      undercloud_port:
+        get_attr:
+        - undercloud_server
+        - addresses
+        - {get_attr: [private_network, private_net]}
+        - 0
+        - port
 
   baremetal_env:
     type: OS::OVB::BaremetalEnvironment
@@ -175,10 +187,11 @@ resources:
       key_name: {get_param: key_name}
       node_count: {get_param: node_count}
       public_net: {get_resource: public_network}
-      private_net: {get_param: private_net}
+      private_net: {get_attr: [private_network, private_net]}
       provision_net: {get_resource: provision_network}
       bmc_flavor: {get_param: bmc_flavor}
       bmc_prefix: {get_param: bmc_prefix}
+      bmc_flavor: {get_param: bmc_flavor}
       bmc_image: {get_param: bmc_image}
       baremetal_prefix: {get_param: baremetal_prefix}
       os_user: {get_param: os_user}

templates/resource-registry.yaml

@@ -2,3 +2,4 @@ resource_registry:
   OS::OVB::ServerPair: virtual-baremetal-servers.yaml
   OS::OVB::BaremetalEnvironment: virtual-baremetal.yaml
   OS::OVB::UndercloudFloating: undercloud-floating.yaml
+  OS::OVB::PrivateNetwork: private-net-existing.yaml