Separate the network configuration per flavor.

This change allows a different network config for each family of hosts. For instance, the controller may have a different network configuration than a block storage node. This change adds a declaration for each family in the overcloud-resource-registry.yaml & overcloud-resource-registry-puppet.yaml. Change-Id: I083df7ebbb535f97d8ddec2ac0e06281c55986cd
2015-04-14 17:21:49 -07:00 · 2015-04-14 17:21:49 -07:00 · 476a1b347d
commit 476a1b347d
parent 723db1317c
12 changed files with 70 additions and 6 deletions
--- a/ceph-storage.yaml
+++ b/ceph-storage.yaml
@ -28,6 +28,7 @@ parameters:
    default: ''
    description: The list of ip/names to use as Ceph monitors
    type: json
+
 resources:
  CephStorage:
    type: OS::Nova::Server
@ -44,6 +45,15 @@ resources:
  NodeUserData:
    type: OS::TripleO::NodeUserData

+  NetworkConfig:
+    type: OS::TripleO::CephStorage::Net::SoftwareConfig
+
+  NetworkDeployment:
+    type: OS::TripleO::SoftwareDeployment
+    properties:
+      config: {get_attr: [NetworkConfig, config_id]}
+      server: {get_resource: CephStorage}
+
  CephStorageDeployment:
    type: OS::Heat::StructuredDeployment
    properties:
--- a/cinder-storage.yaml
+++ b/cinder-storage.yaml
@ -111,6 +111,15 @@ resources:
  NodeUserData:
    type: OS::TripleO::NodeUserData

+  NetworkConfig:
+    type: OS::TripleO::BlockStorage::Net::SoftwareConfig
+
+  NetworkDeployment:
+    type: OS::TripleO::SoftwareDeployment
+    properties:
+      config: {get_attr: [NetworkConfig, config_id]}
+      server: {get_resource: BlockStorage}
+
  BlockStorageDeployment:
    type: OS::Heat::StructuredDeployment
    properties:
--- a/compute.yaml
+++ b/compute.yaml
@ -265,7 +265,7 @@ resources:
    type: OS::TripleO::NodeUserData

  NetworkConfig:
-    type: OS::TripleO::Net::SoftwareConfig
+    type: OS::TripleO::Compute::Net::SoftwareConfig

  NetworkDeployment:
    type: OS::TripleO::SoftwareDeployment
--- a/controller.yaml
+++ b/controller.yaml
@ -424,7 +424,7 @@ resources:
    type: OS::TripleO::NodeUserData

  NetworkConfig:
-    type: OS::TripleO::Net::SoftwareConfig
+    type: OS::TripleO::Controller::Net::SoftwareConfig

  NetworkDeployment:
    type: OS::TripleO::SoftwareDeployment
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@ -1,11 +1,15 @@
 resource_registry:
  OS::TripleO::BlockStorage: puppet/cinder-storage-puppet.yaml
+  OS::TripleO::BlockStorage::Net::SoftwareConfig: net-config-noop.yaml
  OS::TripleO::Compute: puppet/compute-puppet.yaml
+  OS::TripleO::Compute::Net::SoftwareConfig: net-config-bridge.yaml
  OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
  OS::TripleO::Controller: puppet/controller-puppet.yaml
+  OS::TripleO::Controller::Net::SoftwareConfig: net-config-bridge.yaml
  OS::TripleO::ObjectStorage: puppet/swift-storage-puppet.yaml
-  OS::TripleO::Net::SoftwareConfig: net-config-bridge.yaml
+  OS::TripleO::ObjectStorage::Net::SoftwareConfig: net-config-noop.yaml
  OS::TripleO::CephStorage: puppet/ceph-storage-puppet.yaml
+  OS::TripleO::CephStorage::Net::SoftwareConfig: net-config-noop.yaml
  OS::TripleO::ControllerPostDeployment: puppet/controller-post-puppet.yaml
  OS::TripleO::ComputePostDeployment: puppet/compute-post-puppet.yaml
  OS::TripleO::ObjectStoragePostDeployment: puppet/swift-storage-post.yaml
--- a/overcloud-resource-registry.yaml
+++ b/overcloud-resource-registry.yaml
@ -1,11 +1,15 @@
 resource_registry:
  OS::TripleO::BlockStorage: cinder-storage.yaml
+  OS::TripleO::BlockStorage::Net::SoftwareConfig: net-config-noop.yaml
  OS::TripleO::Compute: compute.yaml
+  OS::TripleO::Compute::Net::SoftwareConfig: net-config-noop.yaml
  OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
  OS::TripleO::Controller: controller.yaml
+  OS::TripleO::Controller::Net::SoftwareConfig: net-config-noop.yaml
  OS::TripleO::ObjectStorage: swift-storage.yaml
-  OS::TripleO::Net::SoftwareConfig: net-config-noop.yaml
+  OS::TripleO::ObjectStorage::Net::SoftwareConfig: net-config-noop.yaml
  OS::TripleO::CephStorage: ceph-storage.yaml
+  OS::TripleO::CephStorage::Net::SoftwareConfig: net-config-noop.yaml
  OS::TripleO::ControllerPostDeployment: controller-post.yaml
  OS::TripleO::ComputePostDeployment: compute-post.yaml
  OS::TripleO::ObjectStoragePostDeployment: swift-storage-post.yaml
--- a/puppet/ceph-storage-puppet.yaml
+++ b/puppet/ceph-storage-puppet.yaml
@ -45,6 +45,15 @@ resources:
  NodeUserData:
    type: OS::TripleO::NodeUserData

+  NetworkConfig:
+    type: OS::TripleO::CephStorage::Net::SoftwareConfig
+
+  NetworkDeployment:
+    type: OS::TripleO::SoftwareDeployment
+    properties:
+      config: {get_attr: [NetworkConfig, config_id]}
+      server: {get_resource: CephStorage}
+
  CephStorageDeployment:
    type: OS::Heat::StructuredDeployment
    properties:
@ -57,6 +66,7 @@ resources:
            params:
              server: {get_param: NtpServer}
        enable_package_install: {get_param: EnablePackageInstall}
+
  CephStorageConfig:
    type: OS::Heat::StructuredConfig
    properties:
--- a/puppet/cinder-storage-puppet.yaml
+++ b/puppet/cinder-storage-puppet.yaml
@ -123,6 +123,15 @@ resources:
  NodeUserData:
    type: OS::TripleO::NodeUserData

+  NetworkConfig:
+    type: OS::TripleO::BlockStorage::Net::SoftwareConfig
+
+  NetworkDeployment:
+    type: OS::TripleO::SoftwareDeployment
+    properties:
+      config: {get_attr: [NetworkConfig, config_id]}
+      server: {get_resource: BlockStorage}
+
  BlockStorageDeployment:
    type: OS::Heat::StructuredDeployment
    properties:
--- a/puppet/compute-puppet.yaml
+++ b/puppet/compute-puppet.yaml
@ -268,7 +268,7 @@ resources:
    type: OS::TripleO::NodeUserData

  NetworkConfig:
-    type: OS::TripleO::Net::SoftwareConfig
+    type: OS::TripleO::Compute::Net::SoftwareConfig

  NetworkDeployment:
    type: OS::TripleO::SoftwareDeployment
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@ -431,7 +431,7 @@ resources:
    type: OS::TripleO::NodeUserData

  NetworkConfig:
-    type: OS::TripleO::Net::SoftwareConfig
+    type: OS::TripleO::Controller::Net::SoftwareConfig

  NetworkDeployment:
    type: OS::TripleO::SoftwareDeployment
--- a/puppet/swift-storage-puppet.yaml
+++ b/puppet/swift-storage-puppet.yaml
@ -68,6 +68,15 @@ resources:
  NodeUserData:
    type: OS::TripleO::NodeUserData

+  NetworkConfig:
+    type: OS::TripleO::ObjectStorage::Net::SoftwareConfig
+
+  NetworkDeployment:
+    type: OS::TripleO::SoftwareDeployment
+    properties:
+      config: {get_attr: [NetworkConfig, config_id]}
+      server: {get_resource: SwiftStorage}
+
  SwiftStorageHieraConfig:
    type: OS::Heat::StructuredConfig
    properties:
--- a/swift-storage.yaml
+++ b/swift-storage.yaml
@ -116,6 +116,15 @@ resources:
  NodeUserData:
    type: OS::TripleO::NodeUserData

+  NetworkConfig:
+    type: OS::TripleO::ObjectStorage::Net::SoftwareConfig
+
+  NetworkDeployment:
+    type: OS::TripleO::SoftwareDeployment
+    properties:
+      config: {get_attr: [NetworkConfig, config_id]}
+      server: {get_resource: SwiftStorage}
+
  SwiftStorageDeploy:
    type: OS::Heat::StructuredDeployment
    properties: