From 476a1b347d85c5fb119d428159e9dcd498f0bbd3 Mon Sep 17 00:00:00 2001 From: Dan Sneddon Date: Tue, 14 Apr 2015 17:21:49 -0700 Subject: 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 --- ceph-storage.yaml | 10 ++++++++++ cinder-storage.yaml | 9 +++++++++ compute.yaml | 2 +- controller.yaml | 2 +- overcloud-resource-registry-puppet.yaml | 6 +++++- overcloud-resource-registry.yaml | 6 +++++- puppet/ceph-storage-puppet.yaml | 10 ++++++++++ puppet/cinder-storage-puppet.yaml | 9 +++++++++ puppet/compute-puppet.yaml | 2 +- puppet/controller-puppet.yaml | 2 +- puppet/swift-storage-puppet.yaml | 9 +++++++++ swift-storage.yaml | 9 +++++++++ 12 files changed, 70 insertions(+), 6 deletions(-) diff --git a/ceph-storage.yaml b/ceph-storage.yaml index 93b4deb6..f89d5f3a 100644 --- 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: diff --git a/cinder-storage.yaml b/cinder-storage.yaml index 24739115..44f3b3b8 100644 --- 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: diff --git a/compute.yaml b/compute.yaml index a4190893..2454b89d 100644 --- 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 diff --git a/controller.yaml b/controller.yaml index 37c0debe..7d606072 100644 --- 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 diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 25360530..08293465 100644 --- 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 diff --git a/overcloud-resource-registry.yaml b/overcloud-resource-registry.yaml index aba2212a..71043104 100644 --- 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 diff --git a/puppet/ceph-storage-puppet.yaml b/puppet/ceph-storage-puppet.yaml index 4ce16225..660ea30a 100644 --- 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: diff --git a/puppet/cinder-storage-puppet.yaml b/puppet/cinder-storage-puppet.yaml index 3e55ec85..b59385ac 100644 --- 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: diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml index 11910d79..4d9ff62f 100644 --- 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 diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index a904e041..9ecce0e1 100644 --- 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 diff --git a/puppet/swift-storage-puppet.yaml b/puppet/swift-storage-puppet.yaml index 6f861d88..c3eb9536 100644 --- 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: diff --git a/swift-storage.yaml b/swift-storage.yaml index db8ff5d3..7160c14d 100644 --- 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: -- cgit 1.2.3-korg