openstack
/
fuel-library
Code Issues Proposed changes

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:
Denis Egorenko 2015-06-16 19:50:35 +03:00
parent be2aa0818e
commit 6d16219544
12 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/puppet/osnailyfacter/modular/sahara/sahara.pp
View File

@ -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']

0
deployment/puppet/sahara/lib/puppet/provider/sahara_cluster_template/ruby.rb → deployment/puppet/sahara_templates/lib/puppet/provider/sahara_cluster_template/ruby.rb
View File

0
deployment/puppet/sahara/lib/puppet/provider/sahara_node_group_template/ruby.rb → deployment/puppet/sahara_templates/lib/puppet/provider/sahara_node_group_template/ruby.rb
View File

0
deployment/puppet/sahara/lib/puppet/provider/sahara_openstack.rb → deployment/puppet/sahara_templates/lib/puppet/provider/sahara_openstack.rb
View File

0
deployment/puppet/sahara/lib/puppet/type/sahara_cluster_template.rb → deployment/puppet/sahara_templates/lib/puppet/type/sahara_cluster_template.rb
View File

0
deployment/puppet/sahara/lib/puppet/type/sahara_node_group_template.rb → deployment/puppet/sahara_templates/lib/puppet/type/sahara_node_group_template.rb
View File

2
deployment/puppet/sahara/manifests/templates/create_templates.pp → deployment/puppet/sahara_templates/manifests/create_templates.pp
View File

@ -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
View File

@ -0,0 +1,6 @@
require 'puppetlabs_spec_helper/module_spec_helper'
RSpec.configure do |config|
config.mock_with :rspec
end

0
deployment/puppet/sahara/spec/unit/puppet/provider/sahara_cluster_template/ruby_spec.rb → deployment/puppet/sahara_templates/spec/unit/puppet/provider/sahara_cluster_template/ruby_spec.rb
View File

0
deployment/puppet/sahara/spec/unit/puppet/provider/sahara_node_group_template/ruby_spec.rb → deployment/puppet/sahara_templates/spec/unit/puppet/provider/sahara_node_group_template/ruby_spec.rb
View File

0
deployment/puppet/sahara/spec/unit/puppet/type/sahara_cluster_template.rb → deployment/puppet/sahara_templates/spec/unit/puppet/type/sahara_cluster_template.rb
View File

0
deployment/puppet/sahara/spec/unit/puppet/type/sahara_node_group_template.rb → deployment/puppet/sahara_templates/spec/unit/puppet/type/sahara_node_group_template.rb
View File