diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-12 15:19:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-12 15:19:19 +0000 |
| commit | a31fc6c250683d5463dc9cba4db4f5e09f45dbb4 (patch) | |
| tree | 680c02a86992580c06a5dd0e3861b32c50e6388d /puppet | |
| parent | bff2b3f4e5fd21a2746914e8b3cee67282bb7d82 (diff) | |
| parent | c3d595c49a6c507f16fd2c06cdecb9253dd326f6 (diff) | |
Merge "Use already Deployed/Installed servers"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/ceph-storage.yaml | 2 | ||||
| -rw-r--r-- | puppet/cinder-storage.yaml | 2 | ||||
| -rw-r--r-- | puppet/compute.yaml | 2 | ||||
| -rw-r--r-- | puppet/controller.yaml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml index 8a43b673..baf5bf48 100644 --- a/puppet/ceph-storage.yaml +++ b/puppet/ceph-storage.yaml @@ -98,7 +98,7 @@ parameters: resources: CephStorage: - type: OS::Nova::Server + type: OS::TripleO::Server metadata: os-collect-config: command: {get_param: ConfigCommand} diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml index d0f562ed..9bbef86a 100644 --- a/puppet/cinder-storage.yaml +++ b/puppet/cinder-storage.yaml @@ -98,7 +98,7 @@ parameters: resources: BlockStorage: - type: OS::Nova::Server + type: OS::TripleO::Server metadata: os-collect-config: command: {get_param: ConfigCommand} diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 01807f35..de1e7ab6 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -315,7 +315,7 @@ parameters: resources: NovaCompute: - type: OS::Nova::Server + type: OS::TripleO::Server metadata: os-collect-config: command: {get_param: ConfigCommand} diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 79b141db..dfa63a90 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -363,7 +363,7 @@ parameter_groups: resources: Controller: - type: OS::Nova::Server + type: OS::TripleO::Server metadata: os-collect-config: command: {get_param: ConfigCommand} |