Move sahara templates to stand alone module
Move sahara templates creation to stand alone module sahara_templates due to syncing sahara module from upstream, which is not contain such actions. Partial implements: blueprint upgrade-openstack-puppet-modules Change-Id: Ibbab5aa28c60a1dede59e5d577007d316bf44bd8
This commit is contained in:
parent
be2aa0818e
commit
6d16219544
@ -62,7 +62,7 @@ if $sahara_hash['enabled'] {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if $primary_controller {
|
if $primary_controller {
|
||||||
class { 'sahara::templates::create_templates' :
|
class { 'sahara_templates::create_templates' :
|
||||||
use_neutron => $use_neutron,
|
use_neutron => $use_neutron,
|
||||||
auth_user => $access_admin['user'],
|
auth_user => $access_admin['user'],
|
||||||
auth_password => $access_admin['password'],
|
auth_password => $access_admin['password'],
|
||||||
@ -70,7 +70,7 @@ if $sahara_hash['enabled'] {
|
|||||||
auth_uri => "http://${management_ip}:5000/v2.0/",
|
auth_uri => "http://${management_ip}:5000/v2.0/",
|
||||||
}
|
}
|
||||||
|
|
||||||
Haproxy_backend_status['sahara'] -> Class['sahara::templates::create_templates']
|
Haproxy_backend_status['sahara'] -> Class['sahara_templates::create_templates']
|
||||||
}
|
}
|
||||||
|
|
||||||
Class['sahara'] -> Haproxy_backend_status['sahara']
|
Class['sahara'] -> Haproxy_backend_status['sahara']
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
class sahara::templates::create_templates (
|
class sahara_templates::create_templates (
|
||||||
$auth_uri = 'http://127.0.0.1:5000/v2.0/',
|
$auth_uri = 'http://127.0.0.1:5000/v2.0/',
|
||||||
$auth_user = 'sahara',
|
$auth_user = 'sahara',
|
||||||
$auth_tenant = 'services',
|
$auth_tenant = 'services',
|
6
deployment/puppet/sahara_templates/spec/spec_helper.rb
Normal file
6
deployment/puppet/sahara_templates/spec/spec_helper.rb
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
require 'puppetlabs_spec_helper/module_spec_helper'
|
||||||
|
|
||||||
|
RSpec.configure do |config|
|
||||||
|
config.mock_with :rspec
|
||||||
|
end
|
||||||
|
|
Loading…
Reference in New Issue
Block a user