x
/
fuel-plugin-cinder-gcs
Code Issues Proposed changes

Merge "Improved notifications in Puppet logs"

This commit is contained in:
Jenkins 2016-09-23 09:51:51 +00:00 committed by Gerrit Code Review
parent af680d76d1 5a0ceae640
commit 71d48d79b4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment_scripts/puppet/manifests/gcs_conf.pp → deployment_scripts/puppet/manifests/config.pp
View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
notice('MODULAR:gcs_conf.pp') notice('MODULAR: fuel-plugin-cinder-gcs/config.pp')
include gcs include gcs
class { 'gcs::config': } class { 'gcs::config': }
class { 'gcs::package_utils': } class { 'gcs::package_utils': }

2
deployment_scripts/puppet/manifests/gcs_horizon.pp → deployment_scripts/puppet/manifests/horizon.pp
View File

@ -12,6 +12,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
notice('MODULAR:gcs_horizon.pp') notice('MODULAR: fuel-plugin-cinder-gcs/gcs_horizon.pp')
include gcs include gcs
class { 'gcs::horizon': } class { 'gcs::horizon': }

4
deployment_tasks.yaml
View File

@ -7,7 +7,7 @@
- name: /.*cinder.*/ - name: /.*cinder.*/
role: self role: self
parameters: parameters:
puppet_manifest: puppet/manifests/gcs_conf.pp puppet_manifest: puppet/manifests/config.pp
puppet_modules: puppet/modules:/etc/puppet/modules puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 300 timeout: 300
condition: condition:
@ -22,7 +22,7 @@
- name: gcs_config - name: gcs_config
role: self role: self
parameters: parameters:
puppet_manifest: puppet/manifests/gcs_horizon.pp puppet_manifest: puppet/manifests/horizon.pp
puppet_modules: puppet/modules:/etc/puppet/modules puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 300 timeout: 300