Skip to content

Commit ed5ac1e

Browse files
v-aljev-alje
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs into FromPublicRepo
2 parents 508ca01 + 599f3fb commit ed5ac1e

File tree

2 files changed

+48
-27
lines changed

2 files changed

+48
-27
lines changed

‎articles/ansible/ansible-matrix.md

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ This article lists the Ansible modules for Azure that can provision Azure cloud
2929
| azure_rm_virtualmachine | Yes | Yes | Yes |
3030
| azure_rm_virtualmachine_extension | Yes | Yes | Yes |
3131
| azure_rm_virtualmachine_scaleset | Yes | Yes | Yes |
32+
| azure_rm_image | | Yes | Yes |
3233
| **Networking** | | | |
3334
| azure_rm_virtualnetwork | Yes | Yes | Yes |
3435
| azure_rm_virtualnetwork_facts | Yes | Yes | Yes |
@@ -41,21 +42,24 @@ This article lists the Ansible modules for Azure that can provision Azure cloud
4142
| azure_rm_dnsrecordset_facts | Yes | Yes | Yes |
4243
| azure_rm_dnszone | Yes | Yes | Yes |
4344
| azure_rm_dnszone_facts | Yes | Yes | Yes |
44-
| **Storage** | | | |
4545
| azure_rm_loadbalancer | Yes | Yes | Yes |
4646
| azure_rm_loadbalancer_facts | Yes | Yes | Yes |
47-
| azure_rm_applicationgateway | - | Yes | |
48-
| azure_rm_applicationgateway_facts | - | - | Yes |
49-
| azure_rm_securitygroup | - | - | Yes |
50-
| azure_rm_securitygroup_facts | - | - | Yes |
47+
| azure_rm_appgw | - | - | Yes |
48+
| azure_rm_appgwroute | - | - | Yes |
49+
| azure_rm_appgwroute | - | - | Yes |
50+
| azure_rm_appgwroute_facts | - | - | Yes |
51+
| azure_rm_appgwroutetable | - | - | Yes |
52+
| azure_rm_securitygroup | Yes | Yes | Yes |
53+
| azure_rm_appgwroutetable_facts | Yes | Yes | Yes |
54+
| **Storage** | | | |
5155
| azure_rm_storageaccount | Yes | Yes | Yes |
5256
| azure_rm_storageaccount_facts | Yes | Yes | Yes |
5357
| azure_rm_storageblob | Yes | Yes | Yes |
5458
| azure_rm_managed_disk | Yes | Yes | Yes |
5559
| azure_rm_managed_disk_facts | Yes | Yes | Yes |
5660
| **Containers** | | | |
5761
| azure_rm_acs | Yes | Yes | Yes |
58-
| azure_rm_containerinstance | - | Yes | |
62+
| azure_rm_containerinstance | - | Yes | Yes |
5963
| azure_rm_containerinstance_facts | - | - | Yes |
6064
| azure_rm_containerregistry | - | Yes | Yes |
6165
| azure_rm_containerregistry_facts | - | - | Yes |
@@ -69,28 +73,33 @@ This article lists the Ansible modules for Azure that can provision Azure cloud
6973
| **Databases** | | | |
7074
| azure_rm_sqlserver | - | Yes | Yes |
7175
| azure_rm_sqlserver_facts | - | - | Yes |
72-
| azure_rm_sqldatabase | - | - | Yes |
76+
| azure_rm_sqldatabase | - | Yes | Yes |
7377
| azure_rm_sqldatabase_facts | - | - | Yes |
7478
| azure_rm_sqlelasticpool | - | - | Yes |
7579
| azure_rm_sqlelasticpool_facts | - | - | Yes |
7680
| azure_rm_sqlfirewallrule | - | - | Yes |
7781
| azure_rm_sqlfirewallrule_facts | - | - | Yes |
7882
| azure_rm_mysqlserver | - | Yes | Yes |
7983
| azure_rm_mysqlserver_facts | - | - | Yes |
80-
| azure_rm_mysqldatabase | - | - | Yes |
84+
| azure_rm_mysqldatabase | - | Yes | Yes |
8185
| azure_rm_mysqldatabase_facts | - | - | Yes |
8286
| azure_rm_mysqlfirewallrule | - | - | Yes |
8387
| azure_rm_mysqlfirewallrule_facts | - | - | Yes |
8488
| azure_rm_mysqlconfiguration | - | - | Yes |
8589
| azure_rm_mysqlconfiguration_facts | - | - | Yes |
8690
| azure_rm_postgresqlserver | - | Yes | Yes |
8791
| azure_rm_postgresqlserver_facts | - | - | Yes |
88-
| azure_rm_postgresqldatabase | - | - | Yes |
92+
| azure_rm_postgresqldatabase | - | Yes | Yes |
8993
| azure_rm_postgresqldatabase_facts | - | - | Yes |
9094
| azure_rm_postgresqlfirewallrule | - | - | Yes |
9195
| azure_rm_postgresqlfirewallrule_facts | - | - | Yes |
9296
| azure_rm_postgresqlconfiguration | - | - | Yes |
9397
| azure_rm_postgresqlconfiguration_facts | - | - | Yes |
98+
| **Key Vault** | | | |
99+
| azure_rm_keyvault | - | - | Yes |
100+
| azure_rm_keyvault_facts | - | - | Yes |
101+
| azure_rm_keyvaultkey | - | - | Yes |
102+
| azure_rm_keyvaultsecret | - | - | Yes |
94103

95104
## Introduction to azure_module
96105
The [azure_module playbook role](https://galaxy.ansible.com/Azure/azure_modules/) includes the latest changes and bug fixes for Azure modules from the [devel branch of the Ansible repository](https://github.com/ansible/ansible/tree/devel). If you cannot wait for Ansible's next release, installing the azure_module role is a good choice.
@@ -103,4 +112,4 @@ The [azure_preview_module playbook role](https://galaxy.ansible.com/Azure/azure_
103112
The azure_preview_module playbook role is released every three weeks.
104113

105114
## Next steps
106-
More information related to playbook roles, refer to [Creating Reusable Playbooks](http://docs.ansible.com/ansible/latest/playbooks_reuse.html).
115+
More information related to playbook roles, refer to [Creating Reusable Playbooks](http://docs.ansible.com/ansible/latest/playbooks_reuse.html).

‎articles/service-fabric/service-fabric-get-started-containers.md

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -220,23 +220,31 @@ These environment variables can be overridden in the application manifest:
220220
Configure a host port used to communicate with the container. The port binding maps the port on which the service is listening inside the container to a port on the host. Add a `PortBinding` element in `ContainerHostPolicies` element of the ApplicationManifest.xml file. For this article, `ContainerPort` is 80 (the container exposes port 80, as specified in the Dockerfile) and `EndpointRef` is "Guest1TypeEndpoint" (the endpoint previously defined in the service manifest). Incoming requests to the service on port 8081 are mapped to port 80 on the container.
221221

222222
```xml
223-
<Policies>
224-
<ContainerHostPolicies CodePackageRef="Code">
225-
<PortBinding ContainerPort="80" EndpointRef="Guest1TypeEndpoint"/>
226-
</ContainerHostPolicies>
227-
</Policies>
223+
<ServiceManifestImport>
224+
...
225+
<Policies>
226+
<ContainerHostPolicies CodePackageRef="Code">
227+
<PortBinding ContainerPort="80" EndpointRef="Guest1TypeEndpoint"/>
228+
</ContainerHostPolicies>
229+
</Policies>
230+
...
231+
</ServiceManifestImport>
228232
```
229233

230234
## Configure container registry authentication
231235
Configure container registry authentication by adding `RepositoryCredentials` to `ContainerHostPolicies` of the ApplicationManifest.xml file. Add the account and password for the myregistry.azurecr.io container registry, which allows the service to download the container image from the repository.
232236

233237
```xml
234-
<Policies>
235-
<ContainerHostPolicies CodePackageRef="Code">
236-
<RepositoryCredentials AccountName="myregistry" Password="=P==/==/=8=/=+u4lyOB=+=nWzEeRfF=" PasswordEncrypted="false"/>
237-
<PortBinding ContainerPort="80" EndpointRef="Guest1TypeEndpoint"/>
238-
</ContainerHostPolicies>
239-
</Policies>
238+
<ServiceManifestImport>
239+
...
240+
<Policies>
241+
<ContainerHostPolicies CodePackageRef="Code">
242+
<RepositoryCredentials AccountName="myregistry" Password="=P==/==/=8=/=+u4lyOB=+=nWzEeRfF=" PasswordEncrypted="false"/>
243+
<PortBinding ContainerPort="80" EndpointRef="Guest1TypeEndpoint"/>
244+
</ContainerHostPolicies>
245+
</Policies>
246+
...
247+
</ServiceManifestImport>
240248
```
241249

242250
We recommend that you encrypt the repository password by using an encipherment certificate that's deployed to all nodes of the cluster. When Service Fabric deploys the service package to the cluster, the encipherment certificate is used to decrypt the cipher text. The Invoke-ServiceFabricEncryptText cmdlet is used to create the cipher text for the password, which is added to the ApplicationManifest.xml file.
@@ -281,16 +289,20 @@ Invoke-ServiceFabricEncryptText -CertStore -CertThumbprint $cer.Thumbprint -Text
281289
Replace the password with the cipher text returned by the [Invoke-ServiceFabricEncryptText](/powershell/module/servicefabric/Invoke-ServiceFabricEncryptText?view=azureservicefabricps) cmdlet and set `PasswordEncrypted` to "true".
282290

283291
```xml
284-
<Policies>
285-
<ContainerHostPolicies CodePackageRef="Code">
286-
<RepositoryCredentials AccountName="myregistry" Password="MIIB6QYJKoZIhvcNAQcDoIIB2jCCAdYCAQAxggFRMIIBTQIBADA1MCExHzAdBgNVBAMMFnJ5YW53aWRhdGFlbmNpcGhlcm1lbnQCEFfyjOX/17S6RIoSjA6UZ1QwDQYJKoZIhvcNAQEHMAAEg
292+
<ServiceManifestImport>
293+
...
294+
<Policies>
295+
<ContainerHostPolicies CodePackageRef="Code">
296+
<RepositoryCredentials AccountName="myregistry" Password="MIIB6QYJKoZIhvcNAQcDoIIB2jCCAdYCAQAxggFRMIIBTQIBADA1MCExHzAdBgNVBAMMFnJ5YW53aWRhdGFlbmNpcGhlcm1lbnQCEFfyjOX/17S6RIoSjA6UZ1QwDQYJKoZIhvcNAQEHMAAEg
287297
gEAS7oqxvoz8i6+8zULhDzFpBpOTLU+c2mhBdqXpkLwVfcmWUNA82rEWG57Vl1jZXe7J9BkW9ly4xhU8BbARkZHLEuKqg0saTrTHsMBQ6KMQDotSdU8m8Y2BR5Y100wRjvVx3y5+iNYuy/JmM
288298
gSrNyyMQ/45HfMuVb5B4rwnuP8PAkXNT9VLbPeqAfxsMkYg+vGCDEtd8m+bX/7Xgp/kfwxymOuUCrq/YmSwe9QTG3pBri7Hq1K3zEpX4FH/7W2Zb4o3fBAQ+FuxH4nFjFNoYG29inL0bKEcTX
289299
yNZNKrvhdM3n1Uk/8W2Hr62FQ33HgeFR1yxQjLsUu800PrYcR5tLfyTB8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBybgM5NUV8BeetUbMR8mJhgFBrVSUsnp9B8RyebmtgU36dZiSObDsI
290300
NtTvlzhk11LIlae/5kjPv95r3lw6DHmV4kXLwiCNlcWPYIWBGIuspwyG+28EWSrHmN7Dt2WqEWqeNQ==" PasswordEncrypted="true"/>
291-
<PortBinding ContainerPort="80" EndpointRef="Guest1TypeEndpoint"/>
292-
</ContainerHostPolicies>
293-
</Policies>
301+
<PortBinding ContainerPort="80" EndpointRef="Guest1TypeEndpoint"/>
302+
</ContainerHostPolicies>
303+
</Policies>
304+
...
305+
</ServiceManifestImport>
294306
```
295307

296308
## Configure isolation mode

0 commit comments

Comments
 (0)