diff --git a/Modulefile b/Modulefile index 96885d1..837aba8 100644 --- a/Modulefile +++ b/Modulefile @@ -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' diff --git a/README.markdown b/README.markdown index daf7e50..3071f74 100644 --- a/README.markdown +++ b/README.markdown @@ -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. @@ -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. @@ -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. @@ -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 =================== diff --git a/cli_tools.md b/cli_tools.md index 48147e2..b5bf18d 100644 --- a/cli_tools.md +++ b/cli_tools.md @@ -1,6 +1,6 @@ -

Windows Azure Cloud Provisioner

+

Microsoft Azure Cloud Provisioner

-

Microsoft Open Technologies and Puppet Enterprise provide support for working with virtual machine instances using Windows Azure. Using actions of the puppet azure_vm sub-command, you can launch and manage Microsoft Windows Azure services like virtual machines, virtual networks and SQL database services.

+

Microsoft Open Technologies and Puppet Enterprise provide support for working with virtual machine instances using Microsoft Azure. Using actions of the puppet azure_vm sub-command, you can launch and manage Microsoft Microsoft Azure services like virtual machines, virtual networks and SQL database services.

Required gems

@@ -21,7 +21,7 @@
  • puppet azure_vm terminate for destroying no longer needed instances
  • -

    If you are new to Windows Azure, we recommend reading the Getting Started documentation.

    +

    If you are new to Microsoft Azure, we recommend reading the Getting Started documentation.

    Here is a quick look at some of the basic operations. For comprehensive information, see Getting More Help below.

    @@ -108,7 +108,7 @@ by running puppet help azure_vm create.

    Creating and managing a SQL database server

    -

    Windows Azure SQL Database is a fully managed relational database service that delivers flexible manageability, includes built-in high availability, offers predictable performance, and supports massive scale-out.

    +

    Microsoft Azure SQL Database is a fully managed relational database service that delivers flexible manageability, includes built-in high availability, offers predictable performance, and supports massive scale-out.

    You can create and manage a SQL server as in the following example.

    @@ -120,7 +120,7 @@ by running puppet help azure_vm create.

    Certificate Management

    -

    A management certificate 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. +

    A management certificate 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.

    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.

    @@ -143,7 +143,7 @@ The following are the steps to obtain and extract you management certificates.$ puppet help azure_vm <action> -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. @@ -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. diff --git a/lib/puppet/application_config.rb b/lib/puppet/application_config.rb index 0532d38..314e881 100644 --- a/lib/puppet/application_config.rb +++ b/lib/puppet/application_config.rb @@ -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] @@ -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? @@ -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 diff --git a/lib/puppet/face/azure_affinitygroup.rb b/lib/puppet/face/azure_affinitygroup.rb index c00da6e..1339ba1 100644 --- a/lib/puppet/face/azure_affinitygroup.rb +++ b/lib/puppet/face/azure_affinitygroup.rb @@ -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 diff --git a/lib/puppet/face/azure_cloudservice.rb b/lib/puppet/face/azure_cloudservice.rb index 5dc4f13..67dd5da 100644 --- a/lib/puppet/face/azure_cloudservice.rb +++ b/lib/puppet/face/azure_cloudservice.rb @@ -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 diff --git a/lib/puppet/face/azure_sqldb.rb b/lib/puppet/face/azure_sqldb.rb index b405864..602a74d 100644 --- a/lib/puppet/face/azure_sqldb.rb +++ b/lib/puppet/face/azure_sqldb.rb @@ -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 diff --git a/lib/puppet/face/azure_sqldb/delete.rb b/lib/puppet/face/azure_sqldb/delete.rb index 117c139..5a27cf5 100644 --- a/lib/puppet/face/azure_sqldb/delete.rb +++ b/lib/puppet/face/azure_sqldb/delete.rb @@ -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. diff --git a/lib/puppet/face/azure_sqldb/delete_firewall.rb b/lib/puppet/face/azure_sqldb/delete_firewall.rb index 832197d..a7043c6 100644 --- a/lib/puppet/face/azure_sqldb/delete_firewall.rb +++ b/lib/puppet/face/azure_sqldb/delete_firewall.rb @@ -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. diff --git a/lib/puppet/face/azure_storage.rb b/lib/puppet/face/azure_storage.rb index 4498984..00c4353 100644 --- a/lib/puppet/face/azure_storage.rb +++ b/lib/puppet/face/azure_storage.rb @@ -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 diff --git a/lib/puppet/face/azure_vm.rb b/lib/puppet/face/azure_vm.rb index bf467ea..2272a9f 100644 --- a/lib/puppet/face/azure_vm.rb +++ b/lib/puppet/face/azure_vm.rb @@ -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. diff --git a/lib/puppet/face/azure_vm/bootstrap.rb b/lib/puppet/face/azure_vm/bootstrap.rb index 5d5ec51..8fa717b 100644 --- a/lib/puppet/face/azure_vm/bootstrap.rb +++ b/lib/puppet/face/azure_vm/bootstrap.rb @@ -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) diff --git a/lib/puppet/face/azure_vm/create.rb b/lib/puppet/face/azure_vm/create.rb index faff89c..e7e82e1 100644 --- a/lib/puppet/face/azure_vm/create.rb +++ b/lib/puppet/face/azure_vm/create.rb @@ -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. diff --git a/lib/puppet/face/azure_vm/delete.rb b/lib/puppet/face/azure_vm/delete.rb index 3a368ab..89e009b 100644 --- a/lib/puppet/face/azure_vm/delete.rb +++ b/lib/puppet/face/azure_vm/delete.rb @@ -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) diff --git a/lib/puppet/face/azure_vm/images.rb b/lib/puppet/face/azure_vm/images.rb index 128e3e2..94b4edb 100644 --- a/lib/puppet/face/azure_vm/images.rb +++ b/lib/puppet/face/azure_vm/images.rb @@ -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 diff --git a/lib/puppet/face/azure_vm/locations.rb b/lib/puppet/face/azure_vm/locations.rb index 7e3ed82..94b5e3e 100644 --- a/lib/puppet/face/azure_vm/locations.rb +++ b/lib/puppet/face/azure_vm/locations.rb @@ -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 @@ -27,7 +27,7 @@ returns <<-'EOT' Array of attribute hashes containing information about - Windows Azure locations.' + Microsoft Azure locations.' EOT examples <<-'EOT' diff --git a/lib/puppet/face/azure_vm/restart.rb b/lib/puppet/face/azure_vm/restart.rb index e7ea85f..3430765 100644 --- a/lib/puppet/face/azure_vm/restart.rb +++ b/lib/puppet/face/azure_vm/restart.rb @@ -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. diff --git a/lib/puppet/face/azure_vm/servers.rb b/lib/puppet/face/azure_vm/servers.rb index ee29510..c38cd65 100644 --- a/lib/puppet/face/azure_vm/servers.rb +++ b/lib/puppet/face/azure_vm/servers.rb @@ -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 diff --git a/lib/puppet/face/azure_vm/shutdown.rb b/lib/puppet/face/azure_vm/shutdown.rb index 5356a60..6fa2a20 100644 --- a/lib/puppet/face/azure_vm/shutdown.rb +++ b/lib/puppet/face/azure_vm/shutdown.rb @@ -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) diff --git a/lib/puppet/face/azure_vm/start.rb b/lib/puppet/face/azure_vm/start.rb index 88f8b39..6919180 100644 --- a/lib/puppet/face/azure_vm/start.rb +++ b/lib/puppet/face/azure_vm/start.rb @@ -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. diff --git a/lib/puppet/face/azure_vnet.rb b/lib/puppet/face/azure_vnet.rb index 9fb4ef0..50d2c93 100644 --- a/lib/puppet/face/azure_vnet.rb +++ b/lib/puppet/face/azure_vnet.rb @@ -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 diff --git a/lib/puppet/sql_database.rb b/lib/puppet/sql_database.rb index dd74a24..94edcaf 100644 --- a/lib/puppet/sql_database.rb +++ b/lib/puppet/sql_database.rb @@ -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? @@ -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? @@ -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? diff --git a/manifest.md b/manifest.md index a111c3a..0df4ee4 100644 --- a/manifest.md +++ b/manifest.md @@ -1,6 +1,6 @@

    Microsoft Open Technologies manifest files for Puppet

    -

    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. +

    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.

    Requirements

    @@ -21,13 +21,13 @@ $ winrm set winrm/config/service/auth @{Basic="true"}
  • net-scp (>= 1.0.4)
  • -

    Windows Azure

    +

    Microsoft Azure

    -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.
    puppet module install msopentech/microsoftazure --version 1.2.1
    -For more information on Windows Azure, visit the Windows Azure website. +For more information on Microsoft Azure, visit the Microsoft Azure website.

    Manifest files