Standardize cookbook name to openstack_client
The current cookbook mixed "openstack-client" with "openstack_client" of cookbook name in this project. So this patch standardize cookbook name to openstack_client Change-Id: I9f2a628fb141cbc2ebcbe3fa075fb1a413be8d1e Closes-Bug: #1448099
This commit is contained in:
parent
60d6a29184
commit
7145a38331
|
@ -2,7 +2,7 @@
|
||||||
# vi: set ft=ruby :
|
# vi: set ft=ruby :
|
||||||
|
|
||||||
Vagrant.configure('2') do |config|
|
Vagrant.configure('2') do |config|
|
||||||
config.vm.hostname = 'openstack-client'
|
config.vm.hostname = 'openstack_client'
|
||||||
config.vm.box = 'ubuntu-12.04'
|
config.vm.box = 'ubuntu-12.04'
|
||||||
config.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_#{config.vm.box}_chef-provisionerless.box"
|
config.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_#{config.vm.box}_chef-provisionerless.box"
|
||||||
config.omnibus.chef_version = 'latest'
|
config.omnibus.chef_version = 'latest'
|
||||||
|
@ -13,7 +13,7 @@ Vagrant.configure('2') do |config|
|
||||||
}
|
}
|
||||||
|
|
||||||
chef.run_list = [
|
chef.run_list = [
|
||||||
'recipe[openstack-client::default]'
|
'recipe[openstack_client::default]'
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Encoding: utf-8
|
# Encoding: utf-8
|
||||||
#
|
#
|
||||||
# Cookbook Name:: openstack-client
|
# Cookbook Name:: openstack_client
|
||||||
# Attributes:: default
|
# Attributes:: default
|
||||||
#
|
#
|
||||||
# Copyright 2014, Paul Czarkowski
|
# Copyright 2014, Paul Czarkowski
|
||||||
|
@ -8,5 +8,5 @@
|
||||||
|
|
||||||
# Dependencies and versions
|
# Dependencies and versions
|
||||||
|
|
||||||
default['openstack-client']['fog_version'] = '~> 1.23.0'
|
default['openstack_client']['fog_version'] = '~> 1.23.0'
|
||||||
default['openstack-client']['nokogiri_version'] = '~> 1.6.2.1'
|
default['openstack_client']['nokogiri_version'] = '~> 1.6.2.1'
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# Cookbook Name:: openstack-client
|
# Cookbook Name:: openstack_client
|
||||||
# Library:: openstack
|
# Library:: openstack
|
||||||
# Author:: Paul Czarkowski
|
# Author:: Paul Czarkowski
|
||||||
#
|
#
|
||||||
|
@ -24,7 +24,7 @@ module Openstack
|
||||||
begin
|
begin
|
||||||
require 'fog'
|
require 'fog'
|
||||||
rescue LoadError
|
rescue LoadError
|
||||||
Chef::Log.error("Missing gem 'fog'. Use the default openstack-client recipe to install it first.")
|
Chef::Log.error("Missing gem 'fog'. Use the default openstack_client recipe to install it first.")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# Cookbook Name:: openstack-client
|
# Cookbook Name:: openstack_client
|
||||||
# Library:: nova
|
# Library:: nova
|
||||||
# Author:: JJ Asghar
|
# Author:: JJ Asghar
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# Cookbook Name:: openstack-client
|
# Cookbook Name:: openstack_client
|
||||||
# Library:: storage
|
# Library:: storage
|
||||||
# Author:: Paul Czarkowski
|
# Author:: Paul Czarkowski
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# Cookbook Name:: openstack-client
|
# Cookbook Name:: openstack_client
|
||||||
# Provider:: nova_server
|
# Provider:: nova_server
|
||||||
# Author:: JJ Asghar
|
# Author:: JJ Asghar
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# Cookbook Name:: openstack-client
|
# Cookbook Name:: openstack_client
|
||||||
# Provider:: swift
|
# Provider:: swift
|
||||||
# Author:: Paul Czarkowski
|
# Author:: Paul Czarkowski
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# Cookbook Name:: openstack-client
|
# Cookbook Name:: openstack_client
|
||||||
# Provider:: _example_nova
|
# Provider:: _example_nova
|
||||||
# Author:: JJ Asghar
|
# Author:: JJ Asghar
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# Cookbook Name:: openstack-client
|
# Cookbook Name:: openstack_client
|
||||||
# Provider:: _example_swift
|
# Provider:: _example_swift
|
||||||
# Author:: Paul Czarkowski
|
# Author:: Paul Czarkowski
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Encoding: utf-8
|
# Encoding: utf-8
|
||||||
#
|
#
|
||||||
# Cookbook Name:: openstack-client
|
# Cookbook Name:: openstack_client
|
||||||
# Recipe:: default
|
# Recipe:: default
|
||||||
#
|
#
|
||||||
# Copyright 2014, Paul Czarkowski
|
# Copyright 2014, Paul Czarkowski
|
||||||
|
@ -22,11 +22,11 @@ end
|
||||||
include_recipe 'xml::ruby'
|
include_recipe 'xml::ruby'
|
||||||
|
|
||||||
chef_gem 'nokogiri' do
|
chef_gem 'nokogiri' do
|
||||||
version node['openstack-client']['nokogiri_version']
|
version node['openstack_client']['nokogiri_version']
|
||||||
action :upgrade
|
action :upgrade
|
||||||
end
|
end
|
||||||
|
|
||||||
chef_gem 'fog' do
|
chef_gem 'fog' do
|
||||||
version node['openstack-client']['fog_version']
|
version node['openstack_client']['fog_version']
|
||||||
action :upgrade
|
action :upgrade
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# Cookbook Name:: openstack-client
|
# Cookbook Name:: openstack_client
|
||||||
# Resource:: nova_server
|
# Resource:: nova_server
|
||||||
# Author:: JJ Asghar
|
# Author:: JJ Asghar
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# Cookbook Name:: openstack-client
|
# Cookbook Name:: openstack_client
|
||||||
# Resource:: swift
|
# Resource:: swift
|
||||||
# Author:: Paul Czarkowski
|
# Author:: Paul Czarkowski
|
||||||
#
|
#
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
require_relative 'spec_helper'
|
require_relative 'spec_helper'
|
||||||
|
|
||||||
describe 'openstack-client::default' do
|
describe 'openstack_client::default' do
|
||||||
describe 'ubuntu' do
|
describe 'ubuntu' do
|
||||||
let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
|
let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue