Procházet zdrojové kódy

Azure takes public image reference

Alexandru Mahmoud před 8 roky
rodič
revize
f79004b43b
2 změnil soubory, kde provedl 15 přidání a 11 odebrání
  1. 9 8
      docs/getting_started.rst
  2. 6 3
      docs/topics/setup.rst

+ 9 - 8
docs/getting_started.rst

@@ -17,12 +17,12 @@ For common issues during setup, check the following section:
 
 
 Create a provider
 Create a provider
 -----------------
 -----------------
-To start, you will need to create a reference to a provider object. The
-provider object identifies the cloud you want to work with and supplies your
-credentials. The following two code snippets setup a necessary provider object,
-for AWS and OpenStack. For the details on other providers, take a look at the
-`Setup page <topics/setup.html>`_. The remainder of the code is the same for
-either provider.
+To start, you will need to create a reference to a provider object. The provider
+object identifies the cloud you want to work with and supplies your credentials.
+The following code snippets show the needed configuration fields to setup a
+necessary provider object, for AWS, OpenStack, and Azure. For details on how to
+setup providers, take a look at the `Setup page <topics/setup.html>`_. The
+remainder of the code is the same for either provider.
 
 
 AWS:
 AWS:
 
 
@@ -75,9 +75,10 @@ Azure:
     config = {'azure_subscription_id': 'REPLACE WITH ACTUAL VALUE',
     config = {'azure_subscription_id': 'REPLACE WITH ACTUAL VALUE',
               'azure_client_id': 'REPLACE WITH ACTUAL VALUE',
               'azure_client_id': 'REPLACE WITH ACTUAL VALUE',
               'azure_secret': 'REPLACE WITH ACTUAL VALUE',
               'azure_secret': 'REPLACE WITH ACTUAL VALUE',
-              'azure_tenant': ' REPLACE WITH ACTUAL VALUE'}
+              'azure_tenant': ' REPLACE WITH ACTUAL VALUE',
+              'azure_resource_group' : 'REPLACE WITH ACTUAL VALUE'}
     provider = CloudProviderFactory().create_provider(ProviderList.AZURE, config)
     provider = CloudProviderFactory().create_provider(ProviderList.AZURE, config)
-    image_id = 'ami-2d39803a'  # Ubuntu 14.04 (HVM)
+    image_id = '/subscriptions/{subscription-id}/resourceGroups/{resource-group}/providers/Microsoft.Compute/images/{image-name}'  # 
 
 
 
 
 List some resources
 List some resources

+ 6 - 3
docs/topics/setup.rst

@@ -8,6 +8,12 @@ be provided in one of following ways:
 2. A dictionary
 2. A dictionary
 3. Configuration file
 3. Configuration file
 
 
+Procuring access credentials
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+For Azure, Create service principle credentials from the following link : 
+https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-create-service-principal-portal#check-azure-subscription-permissions
+
+
 Providing access credentials through environment variables
 Providing access credentials through environment variables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The following environment variables must be set, depending on the provider in use.
 The following environment variables must be set, depending on the provider in use.
@@ -77,9 +83,6 @@ will override environment values.
               'azure_resource_group': '<your resource group>'}
               'azure_resource_group': '<your resource group>'}
     provider = CloudProviderFactory().create_provider(ProviderList.AZURE, config)
     provider = CloudProviderFactory().create_provider(ProviderList.AZURE, config)
 
 
-For Azure, Create service principle credentials from the following link : 
-https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-create-service-principal-portal#check-azure-subscription-permissions
-
 Some optional configuration values can only be provided through the config
 Some optional configuration values can only be provided through the config
 dictionary. These are listed below for each provider.
 dictionary. These are listed below for each provider.