Skip to content
This repository has been archived by the owner on Oct 12, 2022. It is now read-only.

Commit

Permalink
Text changes windows to microsoft and Release msopentech-microsoftazu…
Browse files Browse the repository at this point in the history
…re 1.2.1
  • Loading branch information
Ranjan Kumar committed May 29, 2014
1 parent 4460402 commit 3eda29f
Show file tree
Hide file tree
Showing 23 changed files with 65 additions and 65 deletions.
4 changes: 2 additions & 2 deletions Modulefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ name 'msopentech-microsoftazure'
version '1.2.1'
source 'https://github.com/MSOpenTech/azure-puppet.git'
author 'msopentech'
summary 'Windows Azure cloud provisioning module'
description 'Windows Azure cloud provisioning module'
summary 'Microsoft Azure cloud provisioning module'
description 'Microsoft Azure cloud provisioning module'
project_page 'https://github.com/MSOpenTech/azure-puppet'
28 changes: 14 additions & 14 deletions README.markdown
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Windows Azure Cloud Provisioner
Microsoft Azure Cloud Provisioner
========================

Puppet Module to launch and manage Microsoft Windows Azure Services like Virtual Machines, Virtual Network and SQL Database services.
Puppet Module to launch and manage Microsoft Microsoft Azure Services like Virtual Machines, Virtual Network and SQL Database services.

This module requires Puppet 2.7.2 or later.

Expand Down Expand Up @@ -55,14 +55,14 @@ Once launched, you should be able to SSH to the new system using the username an

Other avaliable actions are

bootstrap Install puppet node on Windows Azure VM
create Create Windows Azure VM
delete Delete Windows Azure node instances
images List Windows Azure images
locations List Windows Azure locations
servers List Windows Azure node instances
shutdown Shutdown Windows Azure node instances
start Starts Windows Azure node instances
bootstrap Install puppet node on Microsoft Azure VM
create Create Microsoft Azure VM
delete Delete Microsoft Azure node instances
images List Microsoft Azure images
locations List Microsoft Azure locations
servers List Microsoft Azure node instances
shutdown Shutdown Microsoft Azure node instances
start Starts Microsoft Azure node instances
update_endpoint update existing endpoint of a virtual machine
delete_endpoint Delete endpoint of virtual machine.
add_disk Adds a data disk to a virtual machine.
Expand Down Expand Up @@ -99,8 +99,8 @@ Other avaliable actions are

create Create SQL database server.
create_firewall Create SQL database firewall rule on a server.
delete Delete Windows Azure sql database server
delete_firewall Delete Windows Azure sql database firewall rule on a server.
delete Delete Microsoft Azure sql database server
delete_firewall Delete Microsoft Azure sql database firewall rule on a server.
list List SQL database servers.
list_firewall List firewall of SQL database servers.
reset_password Reset password of sql database server.
Expand Down Expand Up @@ -159,9 +159,9 @@ Other avaliable actions are

# Reporting Issues

Please report any problems you have with the Windows Azure Cloud Provisioner module in issue tracker at
Please report any problems you have with the Microsoft Azure Cloud Provisioner module in issue tracker at

* [Windows Azure Cloud Provisioner Issues](https://github.com/MSOpenTech/azure-puppet/issues)
* [Microsoft Azure Cloud Provisioner Issues](https://github.com/MSOpenTech/azure-puppet/issues)

Puppet Installation
===================
Expand Down
24 changes: 12 additions & 12 deletions cli_tools.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<h1>Windows Azure Cloud Provisioner</h1>
<h1>Microsoft Azure Cloud Provisioner</h1>
<p>Microsoft Open Technologies and Puppet Enterprise provide support for working with virtual machine instances using Windows Azure. Using actions of the <code>puppet azure_vm</code> sub-command, you can launch and manage Microsoft Windows Azure services like virtual machines, virtual networks and SQL database services.</p>
<p>Microsoft Open Technologies and Puppet Enterprise provide support for working with virtual machine instances using Microsoft Azure. Using actions of the <code>puppet azure_vm</code> sub-command, you can launch and manage Microsoft Microsoft Azure services like virtual machines, virtual networks and SQL database services.</p>

<h2>Required gems</h2>

Expand All @@ -21,7 +21,7 @@
<li><code>puppet azure_vm terminate</code> for destroying no longer needed instances</li>
</ul>

<p>If you are new to Windows Azure, we recommend reading the <a href="http://www.windowsazure.com">Getting Started documentation</a>.</p>
<p>If you are new to Microsoft Azure, we recommend reading the <a href="http://www.windowsazure.com">Getting Started documentation</a>.</p>

<p>Here is a quick look at some of the basic operations. For comprehensive information, see <a href="#getting-more-help">Getting More Help</a> below.</p>

Expand Down Expand Up @@ -108,7 +108,7 @@ by running <code>puppet help azure_vm create</code>.</p>

<h2 id="sql-database">Creating and managing a SQL database server</h2>

<p><a href="http://www.windowsazure.com/en-us/services/sql-database/" target="_blank">Windows Azure SQL Database</a> is a fully managed relational database service that delivers flexible manageability, includes built-in high availability, offers predictable performance, and supports massive scale-out.</p>
<p><a href="http://www.windowsazure.com/en-us/services/sql-database/" target="_blank">Microsoft Azure SQL Database</a> is a fully managed relational database service that delivers flexible manageability, includes built-in high availability, offers predictable performance, and supports massive scale-out.</p>

<p>You can create and manage a SQL server as in the following example.</p>

Expand All @@ -120,7 +120,7 @@ by running <code>puppet help azure_vm create</code>.</p>

<h2 id="cert-management">Certificate Management</h2>

<p>A <a href="http://msdn.microsoft.com/en-us/library/windowsazure/gg981929.aspx" target="_blank">management certificate</a> is needed when you want to use the Service Management API to interact with the Windows Azure image platform. Stored at the subscription level, these certificates are independent of any hosted service or deployment.
<p>A <a href="http://msdn.microsoft.com/en-us/library/windowsazure/gg981929.aspx" target="_blank">management certificate</a> is needed when you want to use the Service Management API to interact with the Microsoft Azure image platform. Stored at the subscription level, these certificates are independent of any hosted service or deployment.

<p>Currently the sdk supports *.pem or *.pfx (passwordless pfx) for service management operations.
The following are the steps to obtain and extract you management certificates.</p>
Expand All @@ -143,7 +143,7 @@ The following are the steps to obtain and extract you management certificates.</

<pre><code>$ puppet help azure_vm &lt;action&gt;

This subcommand provides a command line interface to work with Windows Azure virtual
This subcommand provides a command line interface to work with Microsoft Azure virtual
machine instances. The goal of these actions are to easily create new
machines, install Puppet onto them, and tear them down when they're no longer
required.
Expand All @@ -155,12 +155,12 @@ OPTIONS:
--debug - Whether to log debug information.

ACTIONS:
bootstrap Install puppet node on a Windows Azure VM
create Create a Windows Azure VM
delete Delete a Windows Azure node instance
servers List Windows Azure node instances
shutdown Shutdown Windows Azure node instance
start Starts Windows Azure node instance
bootstrap Install puppet node on a Microsoft Azure VM
create Create a Microsoft Azure VM
delete Delete a Microsoft Azure node instance
servers List Microsoft Azure node instances
shutdown Shutdown Microsoft Azure node instance
start Starts Microsoft Azure node instance

See 'puppet help azure_vm' or 'help puppet-azure_vm' for full help.
</code></pre>
Expand Down
16 changes: 8 additions & 8 deletions lib/puppet/application_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ def add_default_options(action)

def add_management_certificate_option(action)
action.option '--management-certificate=' do
summary 'The subscription identifier for the Windows Azure portal.'
description 'The subscription identifier for the Windows Azure portal.'
summary 'The subscription identifier for the Microsoft Azure portal.'
description 'The subscription identifier for the Microsoft Azure portal.'
required
before_action do |act, args, options|
file = options[:management_certificate]
Expand All @@ -36,8 +36,8 @@ def add_management_certificate_option(action)

def add_subscription_id_option(action)
action.option '--azure-subscription-id=' do
summary 'The subscription identifier for the Windows Azure portal.'
description 'The subscription identifier for the Windows Azure portal.'
summary 'The subscription identifier for the Microsoft Azure portal.'
description 'The subscription identifier for the Microsoft Azure portal.'
required
before_action do |act, args, options|
if options[:azure_subscription_id].empty?
Expand All @@ -49,17 +49,17 @@ def add_subscription_id_option(action)

def add_management_endpoint_option(action)
action.option '--management-endpoint=' do
summary 'The management endpoint for the Windows Azure portal.'
description 'The management endpoint for the Windows Azure portal.'
summary 'The management endpoint for the Microsoft Azure portal.'
description 'The management endpoint for the Microsoft Azure portal.'

end
end

def add_location_option(action, optional = false)
action.option '--location=' do
summary 'The location identifier for the Windows Azure portal.'
summary 'The location identifier for the Microsoft Azure portal.'
description <<-EOT
The location identifier for the Windows Azure portal.
The location identifier for the Microsoft Azure portal.
valid choices are ('West US', 'East US', 'Southeast Asia',
'North Europe', 'West Europe', 'East Asia' ...).
EOT
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/face/azure_affinitygroup.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

summary 'View and manage Window Azure affinity groups.'
description <<-'EOT'
This subcommand provides a command line interface to work with Windows Azure
This subcommand provides a command line interface to work with Microsoft Azure
affinity groups. The goal of these actions are to easily create new or update
affinity group.
EOT
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/face/azure_cloudservice.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

summary 'View and manage Window Azure cloud service.'
description <<-'EOT'
This subcommand provides a command line interface to work with Windows Azure
This subcommand provides a command line interface to work with Microsoft Azure
cloud services. The goal of these actions are to easily manage cloud service.
EOT

Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/face/azure_sqldb.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

summary 'View and manage Window Azure database servers.'
description <<-'EOT'
This subcommand provides a command line interface to work with Windows Azure
This subcommand provides a command line interface to work with Microsoft Azure
machine instances. The goal of these actions are to easily create new
database servers.
EOT
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/face/azure_sqldb/delete.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
Puppet::Face.define :azure_sqldb, '1.0.0' do
action :delete do

summary 'Delete Windows Azure sql database server'
summary 'Delete Microsoft Azure sql database server'

description <<-'EOT'
The delete action delete windows azure sql server.
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/face/azure_sqldb/delete_firewall.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
Puppet::Face.define :azure_sqldb, '1.0.0' do
action :delete_firewall do

summary 'Delete Windows Azure sql database firewall rule on server'
summary 'Delete Microsoft Azure sql database firewall rule on server'

description <<-'EOT'
The delete action delete windows azure sql database firewall on server.
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/face/azure_storage.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

summary 'View and manage Window Azure storage account.'
description <<-'EOT'
This subcommand provides a command line interface to work with Windows Azure
This subcommand provides a command line interface to work with Microsoft Azure
storage account. The goal of these actions are to easily manage storage account.
EOT

Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/face/azure_vm.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

summary 'View and manage Window Azure nodes.'
description <<-'EOT'
This subcommand provides a command line interface to work with Windows Azure
This subcommand provides a command line interface to work with Microsoft Azure
machine instances. The goal of these actions are to easily create new
machines, install Puppet onto them, and tear them down when they're no longer
required.
Expand Down
4 changes: 2 additions & 2 deletions lib/puppet/face/azure_vm/bootstrap.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
Puppet::Face.define :azure_vm, '1.0.0' do
action :bootstrap do

summary 'Install puppet node on Windows Azure VM'
description 'Install puppet node on Windows Azure Virtual Machine.'
summary 'Install puppet node on Microsoft Azure VM'
description 'Install puppet node on Microsoft Azure Virtual Machine.'

Puppet::VirtualMachine.add_bootstrap_options(self)

Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/face/azure_vm/create.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
Puppet::Face.define :azure_vm, '1.0.0' do
action :create do

summary 'Create Windows Azure VM'
summary 'Create Microsoft Azure VM'

description <<-'EOT'
The create action create a storage account, cloud service and virtula machine.
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/face/azure_vm/delete.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
Puppet::Face.define :azure_vm, '1.0.0' do
action :delete do

summary 'Delete Windows Azure node instances'
summary 'Delete Microsoft Azure node instances'
description 'The delete action delete windows azure node instances.'

Puppet::VirtualMachine.add_delete_options(self)
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/face/azure_vm/images.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
Puppet::Face.define :azure_vm, '1.0.0' do
action :images do

summary 'List Windows Azure images'
summary 'List Microsoft Azure images'

description <<-'EOT'
The images action obtains a list of images from the cloud provider and
Expand Down
4 changes: 2 additions & 2 deletions lib/puppet/face/azure_vm/locations.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
Puppet::Face.define :azure_vm, '1.0.0' do
action :locations do

summary 'List Windows Azure locations'
summary 'List Microsoft Azure locations'

description <<-'EOT'
The locations action obtains a list of locatons from the cloud provider
Expand All @@ -27,7 +27,7 @@

returns <<-'EOT'
Array of attribute hashes containing information about
Windows Azure locations.'
Microsoft Azure locations.'
EOT

examples <<-'EOT'
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/face/azure_vm/restart.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
Puppet::Face.define :azure_vm, '1.0.0' do
action :restart do

summary 'Restarts Windows Azure node instance'
summary 'Restarts Microsoft Azure node instance'

description <<-'EOT'
The restart action restarts windows azure node instance.
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/face/azure_vm/servers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Puppet::Face.define :azure_vm, '1.0.0' do
action :servers do

summary 'List Windows Azure node instances'
summary 'List Microsoft Azure node instances'
arguments 'list'
description <<-'EOT'
The list action obtains a list of instances from the cloud provider and
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/face/azure_vm/shutdown.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
Puppet::Face.define :azure_vm, '1.0.0' do
action :shutdown do

summary 'Shutdown Windows Azure node instances'
summary 'Shutdown Microsoft Azure node instances'
description 'The shutdown action stops windows azure node instances.'

Puppet::VirtualMachine.add_shutdown_options(self)
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/face/azure_vm/start.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
Puppet::Face.define :azure_vm, '1.0.0' do
action :start do

summary 'starts Windows Azure node instances'
summary 'starts Microsoft Azure node instances'

description <<-'EOT'
The start action starts windows azure node instances.
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/face/azure_vnet.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

summary 'View and manage Window Azure virtual networks.'
description <<-'EOT'
This subcommand provides a command line interface to work with Windows Azure
This subcommand provides a command line interface to work with Microsoft Azure
virtual networks. The goal of these actions are to easily create new or update
virtual network.
EOT
Expand Down
12 changes: 6 additions & 6 deletions lib/puppet/sql_database.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ def add_delete_firewall_options(action)

def add_login_option(action)
action.option '--login=' do
summary 'The login username for the Windows Azure sql database server.'
description 'The login username of Windows Azure sql database server.'
summary 'The login username for the Microsoft Azure sql database server.'
description 'The login username of Microsoft Azure sql database server.'
required
before_action do |act, args, options|
if options[:login].empty?
Expand All @@ -69,8 +69,8 @@ def add_login_option(action)

def add_password_option(action)
action.option '--password=' do
summary 'The pasword for the Windows Azure sql database server.'
description 'The password for the Windows Azure sql database server.'
summary 'The pasword for the Microsoft Azure sql database server.'
description 'The password for the Microsoft Azure sql database server.'
required
before_action do |act, args, options|
if options[:password].empty?
Expand All @@ -82,8 +82,8 @@ def add_password_option(action)

def add_server_name_option(action)
action.option '--server-name=' do
summary 'The server name for the Windows Azure sql database server.'
description 'The server name for the Windows Azure sql database server.'
summary 'The server name for the Microsoft Azure sql database server.'
description 'The server name for the Microsoft Azure sql database server.'
required
before_action do |act, args, options|
if options[:server_name].empty?
Expand Down
8 changes: 4 additions & 4 deletions manifest.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<h1>Microsoft Open Technologies manifest files for Puppet</h1>
<p>Microsoft Open Technologies is providing a Windows Azure Cloud Provisioner Module for Puppet that streamlines provisioning Windows Azure services like, virtual machines, virtual networks and SQL database services.
<p>Microsoft Open Technologies is providing a Microsoft Azure Cloud Provisioner Module for Puppet that streamlines provisioning Microsoft Azure services like, virtual machines, virtual networks and SQL database services.
</p>

<h2>Requirements</h2>
Expand All @@ -21,13 +21,13 @@ $ winrm set winrm/config/service/auth @{Basic="true"}
<li>net-scp (>= 1.0.4)</li>
</p>

<h2>Windows Azure</h2>
<h2>Microsoft Azure</h2>

To provision a puppet agent on the Windows Azure platform, run the following command.
To provision a puppet agent on the Microsoft Azure platform, run the following command.

<pre><code>puppet module install msopentech/microsoftazure --version 1.2.1</code></pre>

For more information on Windows Azure, <a href="http://www.windowsazure.com/en-us/solutions/infrastructure/" tartget="_blank">visit the Windows Azure website</a>.
For more information on Microsoft Azure, <a href="http://www.windowsazure.com/en-us/solutions/infrastructure/" tartget="_blank">visit the Microsoft Azure website</a>.

<h2>Manifest files</h2>

Expand Down

0 comments on commit 3eda29f

Please sign in to comment.