diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-07-27 22:29:36 -0400 |
|---|---|---|
| committer | Feng Pan <fpan@redhat.com> | 2017-07-28 15:26:33 -0400 |
| commit | d9ad6d211b86111bdca6b78891808a1bbdec86d2 (patch) | |
| tree | 8a9b9ef064d19fc093ffed00945e11141bfe89c0 | |
| parent | a6e575c8f0af17e62990653bcf4a12c688c21aad (diff) | |
Add scope to configure_role_mappings resource calling
Change-Id: Icf7f31b09d0f24f8c61235bd4e3dda43d3d47bc7
Signed-off-by: Feng Pan <fpan@redhat.com>
| -rw-r--r-- | manifests/honeycomb.pp | 12 | ||||
| -rw-r--r-- | manifests/init.pp | 8 | ||||
| -rw-r--r-- | spec/acceptance/fdio_spec.rb | 2 |
3 files changed, 10 insertions, 12 deletions
diff --git a/manifests/honeycomb.pp b/manifests/honeycomb.pp index 25739f2..ef216c3 100644 --- a/manifests/honeycomb.pp +++ b/manifests/honeycomb.pp @@ -69,9 +69,8 @@ class fdio::honeycomb ( ensure => present, require => Package['vpp'], } - -> # Configuration of Honeycomb - file { 'honeycomb.json': + -> file { 'honeycomb.json': ensure => file, path => '/opt/honeycomb/config/honeycomb.json', # Set user:group owners @@ -80,8 +79,7 @@ class fdio::honeycomb ( # Use a template to populate the content content => template('fdio/honeycomb.json.erb'), } - ~> - service { 'honeycomb': + ~> service { 'honeycomb': ensure => running, enable => true, hasstatus => true, @@ -103,8 +101,8 @@ class fdio::honeycomb ( try_sleep => 30, path => '/usr/sbin:/usr/bin:/sbin:/bin', require => Service['honeycomb'], - }-> - exec { 'Check VPP was mounted into ODL operational DS': + } + -> exec { 'Check VPP was mounted into ODL operational DS': command => "curl --fail -u ${opendaylight_username}:${opendaylight_password} ${oper_mount_url} | grep ${node_id}", tries => 5, try_sleep => 30, @@ -112,7 +110,7 @@ class fdio::honeycomb ( } if !empty($interface_role_map) { - configure_role_mappings { $interface_role_map: + fdio::honeycomb::configure_role_mappings { $interface_role_map: honeycomb_username => $user, honeycomb_password => $password, honeycomb_url => "http://${bind_ip}:${rest_port}", diff --git a/manifests/init.pp b/manifests/init.pp index e2d1c0b..ddbf411 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -90,9 +90,9 @@ class fdio ( } } - class { '::fdio::install': } -> - class { '::fdio::config': } ~> - class { '::fdio::service': } -> - Class['::fdio'] + class { '::fdio::install': } + -> class { '::fdio::config': } + ~> class { '::fdio::service': } + -> Class['::fdio'] } diff --git a/spec/acceptance/fdio_spec.rb b/spec/acceptance/fdio_spec.rb index 6e2ec8d..a3a0a17 100644 --- a/spec/acceptance/fdio_spec.rb +++ b/spec/acceptance/fdio_spec.rb @@ -7,7 +7,7 @@ describe 'fdio' do it 'should work with no errors' do pp= <<-EOS class { '::fdio': - repo_branch => 'release' + repo_branch => 'stable.1704' } EOS |