diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-27 02:25:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-27 02:25:22 +0000 |
| commit | eaa8092211a7cc805f320ad9aba830a5800d2bce (patch) | |
| tree | 74fc01bbab40df6b6ef6b573c99fd1559e7262c3 /puppet | |
| parent | d24690765c3fd2703d5aa234767a3389ab1d28b6 (diff) | |
| parent | 4e19c7a13e4717082f676ec5e72d35e9ea963a33 (diff) | |
Merge "Enable DPDK on boot using PreNetworkConfig"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/blockstorage-role.yaml | 1 | ||||
| -rw-r--r-- | puppet/cephstorage-role.yaml | 1 | ||||
| -rw-r--r-- | puppet/compute-role.yaml | 1 | ||||
| -rw-r--r-- | puppet/controller-role.yaml | 1 | ||||
| -rw-r--r-- | puppet/objectstorage-role.yaml | 1 | ||||
| -rw-r--r-- | puppet/role.role.j2.yaml | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/puppet/blockstorage-role.yaml b/puppet/blockstorage-role.yaml index 40b2ca57..612a4a01 100644 --- a/puppet/blockstorage-role.yaml +++ b/puppet/blockstorage-role.yaml @@ -407,6 +407,7 @@ resources: properties: server: {get_resource: BlockStorage} RoleParameters: {get_param: RoleParameters} + ServiceNames: {get_param: ServiceNames} NetworkDeployment: type: OS::TripleO::SoftwareDeployment diff --git a/puppet/cephstorage-role.yaml b/puppet/cephstorage-role.yaml index 78d66fa8..e7afcb40 100644 --- a/puppet/cephstorage-role.yaml +++ b/puppet/cephstorage-role.yaml @@ -413,6 +413,7 @@ resources: properties: server: {get_resource: CephStorage} RoleParameters: {get_param: RoleParameters} + ServiceNames: {get_param: ServiceNames} NetworkDeployment: type: OS::TripleO::SoftwareDeployment diff --git a/puppet/compute-role.yaml b/puppet/compute-role.yaml index 12c4445a..5a662e86 100644 --- a/puppet/compute-role.yaml +++ b/puppet/compute-role.yaml @@ -416,6 +416,7 @@ resources: properties: server: {get_resource: NovaCompute} RoleParameters: {get_param: RoleParameters} + ServiceNames: {get_param: ServiceNames} NetworkConfig: type: OS::TripleO::Compute::Net::SoftwareConfig diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml index 1036ffbf..09e5b2b9 100644 --- a/puppet/controller-role.yaml +++ b/puppet/controller-role.yaml @@ -439,6 +439,7 @@ resources: properties: server: {get_resource: Controller} RoleParameters: {get_param: RoleParameters} + ServiceNames: {get_param: ServiceNames} NetworkConfig: type: OS::TripleO::Controller::Net::SoftwareConfig diff --git a/puppet/objectstorage-role.yaml b/puppet/objectstorage-role.yaml index 6a5f2d20..4a1670f8 100644 --- a/puppet/objectstorage-role.yaml +++ b/puppet/objectstorage-role.yaml @@ -408,6 +408,7 @@ resources: properties: server: {get_resource: SwiftStorage} RoleParameters: {get_param: RoleParameters} + ServiceNames: {get_param: ServiceNames} NetworkDeployment: type: OS::TripleO::SoftwareDeployment diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index 8b6be860..b45736c1 100644 --- a/puppet/role.role.j2.yaml +++ b/puppet/role.role.j2.yaml @@ -433,6 +433,7 @@ resources: properties: server: {get_resource: {{role}}} RoleParameters: {get_param: RoleParameters} + ServiceNames: {get_param: ServiceNames} NetworkDeployment: type: OS::TripleO::SoftwareDeployment |