From 6d1621954422a308fa7164ca900209e111853ac5 Mon Sep 17 00:00:00 2001 From: Denis Egorenko Date: Tue, 16 Jun 2015 19:50:35 +0300 Subject: [PATCH] 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 --- deployment/puppet/osnailyfacter/modular/sahara/sahara.pp | 4 ++-- .../lib/puppet/provider/sahara_cluster_template/ruby.rb | 0 .../lib/puppet/provider/sahara_node_group_template/ruby.rb | 0 .../lib/puppet/provider/sahara_openstack.rb | 0 .../lib/puppet/type/sahara_cluster_template.rb | 0 .../lib/puppet/type/sahara_node_group_template.rb | 0 .../manifests}/create_templates.pp | 2 +- deployment/puppet/sahara_templates/spec/spec_helper.rb | 6 ++++++ .../puppet/provider/sahara_cluster_template/ruby_spec.rb | 0 .../puppet/provider/sahara_node_group_template/ruby_spec.rb | 0 .../spec/unit/puppet/type/sahara_cluster_template.rb | 0 .../spec/unit/puppet/type/sahara_node_group_template.rb | 0 12 files changed, 9 insertions(+), 3 deletions(-) rename deployment/puppet/{sahara => sahara_templates}/lib/puppet/provider/sahara_cluster_template/ruby.rb (100%) rename deployment/puppet/{sahara => sahara_templates}/lib/puppet/provider/sahara_node_group_template/ruby.rb (100%) rename deployment/puppet/{sahara => sahara_templates}/lib/puppet/provider/sahara_openstack.rb (100%) rename deployment/puppet/{sahara => sahara_templates}/lib/puppet/type/sahara_cluster_template.rb (100%) rename deployment/puppet/{sahara => sahara_templates}/lib/puppet/type/sahara_node_group_template.rb (100%) rename deployment/puppet/{sahara/manifests/templates => sahara_templates/manifests}/create_templates.pp (99%) create mode 100644 deployment/puppet/sahara_templates/spec/spec_helper.rb rename deployment/puppet/{sahara => sahara_templates}/spec/unit/puppet/provider/sahara_cluster_template/ruby_spec.rb (100%) rename deployment/puppet/{sahara => sahara_templates}/spec/unit/puppet/provider/sahara_node_group_template/ruby_spec.rb (100%) rename deployment/puppet/{sahara => sahara_templates}/spec/unit/puppet/type/sahara_cluster_template.rb (100%) rename deployment/puppet/{sahara => sahara_templates}/spec/unit/puppet/type/sahara_node_group_template.rb (100%) diff --git a/deployment/puppet/osnailyfacter/modular/sahara/sahara.pp b/deployment/puppet/osnailyfacter/modular/sahara/sahara.pp index ec68d198be..f0ee442b43 100644 --- a/deployment/puppet/osnailyfacter/modular/sahara/sahara.pp +++ b/deployment/puppet/osnailyfacter/modular/sahara/sahara.pp @@ -62,7 +62,7 @@ if $sahara_hash['enabled'] { } if $primary_controller { - class { 'sahara::templates::create_templates' : + class { 'sahara_templates::create_templates' : use_neutron => $use_neutron, auth_user => $access_admin['user'], auth_password => $access_admin['password'], @@ -70,7 +70,7 @@ if $sahara_hash['enabled'] { 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'] diff --git a/deployment/puppet/sahara/lib/puppet/provider/sahara_cluster_template/ruby.rb b/deployment/puppet/sahara_templates/lib/puppet/provider/sahara_cluster_template/ruby.rb similarity index 100% rename from deployment/puppet/sahara/lib/puppet/provider/sahara_cluster_template/ruby.rb rename to deployment/puppet/sahara_templates/lib/puppet/provider/sahara_cluster_template/ruby.rb diff --git a/deployment/puppet/sahara/lib/puppet/provider/sahara_node_group_template/ruby.rb b/deployment/puppet/sahara_templates/lib/puppet/provider/sahara_node_group_template/ruby.rb similarity index 100% rename from deployment/puppet/sahara/lib/puppet/provider/sahara_node_group_template/ruby.rb rename to deployment/puppet/sahara_templates/lib/puppet/provider/sahara_node_group_template/ruby.rb diff --git a/deployment/puppet/sahara/lib/puppet/provider/sahara_openstack.rb b/deployment/puppet/sahara_templates/lib/puppet/provider/sahara_openstack.rb similarity index 100% rename from deployment/puppet/sahara/lib/puppet/provider/sahara_openstack.rb rename to deployment/puppet/sahara_templates/lib/puppet/provider/sahara_openstack.rb diff --git a/deployment/puppet/sahara/lib/puppet/type/sahara_cluster_template.rb b/deployment/puppet/sahara_templates/lib/puppet/type/sahara_cluster_template.rb similarity index 100% rename from deployment/puppet/sahara/lib/puppet/type/sahara_cluster_template.rb rename to deployment/puppet/sahara_templates/lib/puppet/type/sahara_cluster_template.rb diff --git a/deployment/puppet/sahara/lib/puppet/type/sahara_node_group_template.rb b/deployment/puppet/sahara_templates/lib/puppet/type/sahara_node_group_template.rb similarity index 100% rename from deployment/puppet/sahara/lib/puppet/type/sahara_node_group_template.rb rename to deployment/puppet/sahara_templates/lib/puppet/type/sahara_node_group_template.rb diff --git a/deployment/puppet/sahara/manifests/templates/create_templates.pp b/deployment/puppet/sahara_templates/manifests/create_templates.pp similarity index 99% rename from deployment/puppet/sahara/manifests/templates/create_templates.pp rename to deployment/puppet/sahara_templates/manifests/create_templates.pp index c817b31660..61d193a7b7 100644 --- a/deployment/puppet/sahara/manifests/templates/create_templates.pp +++ b/deployment/puppet/sahara_templates/manifests/create_templates.pp @@ -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_user = 'sahara', $auth_tenant = 'services', diff --git a/deployment/puppet/sahara_templates/spec/spec_helper.rb b/deployment/puppet/sahara_templates/spec/spec_helper.rb new file mode 100644 index 0000000000..e7e08c20a4 --- /dev/null +++ b/deployment/puppet/sahara_templates/spec/spec_helper.rb @@ -0,0 +1,6 @@ +require 'puppetlabs_spec_helper/module_spec_helper' + +RSpec.configure do |config| + config.mock_with :rspec +end + diff --git a/deployment/puppet/sahara/spec/unit/puppet/provider/sahara_cluster_template/ruby_spec.rb b/deployment/puppet/sahara_templates/spec/unit/puppet/provider/sahara_cluster_template/ruby_spec.rb similarity index 100% rename from deployment/puppet/sahara/spec/unit/puppet/provider/sahara_cluster_template/ruby_spec.rb rename to deployment/puppet/sahara_templates/spec/unit/puppet/provider/sahara_cluster_template/ruby_spec.rb diff --git a/deployment/puppet/sahara/spec/unit/puppet/provider/sahara_node_group_template/ruby_spec.rb b/deployment/puppet/sahara_templates/spec/unit/puppet/provider/sahara_node_group_template/ruby_spec.rb similarity index 100% rename from deployment/puppet/sahara/spec/unit/puppet/provider/sahara_node_group_template/ruby_spec.rb rename to deployment/puppet/sahara_templates/spec/unit/puppet/provider/sahara_node_group_template/ruby_spec.rb diff --git a/deployment/puppet/sahara/spec/unit/puppet/type/sahara_cluster_template.rb b/deployment/puppet/sahara_templates/spec/unit/puppet/type/sahara_cluster_template.rb similarity index 100% rename from deployment/puppet/sahara/spec/unit/puppet/type/sahara_cluster_template.rb rename to deployment/puppet/sahara_templates/spec/unit/puppet/type/sahara_cluster_template.rb diff --git a/deployment/puppet/sahara/spec/unit/puppet/type/sahara_node_group_template.rb b/deployment/puppet/sahara_templates/spec/unit/puppet/type/sahara_node_group_template.rb similarity index 100% rename from deployment/puppet/sahara/spec/unit/puppet/type/sahara_node_group_template.rb rename to deployment/puppet/sahara_templates/spec/unit/puppet/type/sahara_node_group_template.rb