cloud-init

Merge ~tomerc/cloud-init:patch-replace-nameserver-with-nameservers into cloud-init:master

  1. Git
  2. lp:~tomerc/cloud-init
  3. patch-replace-nameserver-with-nameservers
  4. Merge into master
Proposed by Tomer Cohen
Status: Merged
Approved by: Scott Moser
Approved revision: a7f17db2d710b43a1edf9168d24aa403399523df
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~tomerc/cloud-init:patch-replace-nameserver-with-nameservers
Merge into: cloud-init:master
Diff against target: 13 lines (+1/-1)
1 file modified
doc/rtd/topics/network-config-format-v1.rst (+1/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Mina Galić (community) Approve
Scott Moser Approve
Review via email: mp+357919@code.launchpad.net

Commit message

doc: Change dns_nameserver property to dns_nameservers.

According to the examples in the page, v1 network config DNS should
be defined using the dns_nameservers. The singular dns_nameserver is
undefined.

Description of the change

According to the examples in the page, DNS should be defined using the dns_nameservers. Specifying dns_nameserver is undefined.

https://cloudinit.readthedocs.io/en/latest/topics/network-config-format-v1.html#subnet-ip

To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) wrote :

Thanks!

review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.ubuntu.com/server/job/cloud-init-autoland-test/97/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    FAILED: Ubuntu LTS: Integration

review: Needs Fixing (continuous-integration)
Revision history for this message
Mina Galić (minagalic) wrote :

👍

review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

FAILED: Continuous integration, rev:a7f17db
https://jenkins.ubuntu.com/server/job/cloud-init-ci/464/
Executed test runs:
    SUCCESS: Checkout
    FAILED: Unit & Style Tests

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/464/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Scott Moser (smoser) wrote :

I started a run at
https://jenkins.ubuntu.com/server/job/cloud-init-ci/464/console
but it hung due to this missing chad's fix at
 ef0611a51a98a273cfa37b0daeb3e9d151888b88

the rebase-and-lander should be fine. so i'm going to approve.

Revision history for this message
Server Team CI bot (server-team-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/doc/rtd/topics/network-config-format-v1.rst b/doc/rtd/topics/network-config-format-v1.rst
2index 8352000..dfbde51 100644
3--- a/doc/rtd/topics/network-config-format-v1.rst
4+++ b/doc/rtd/topics/network-config-format-v1.rst
5@@ -384,7 +384,7 @@ Valid keys for ``subnets`` include the following:
6 - ``address``: IPv4 or IPv6 address. It may include CIDR netmask notation.
7 - ``netmask``: IPv4 subnet mask in dotted format or CIDR notation.
8 - ``gateway``: IPv4 address of the default gateway for this subnet.
9-- ``dns_nameserver``: Specify a list of IPv4 dns server IPs to end up in
10+- ``dns_nameservers``: Specify a list of IPv4 dns server IPs to end up in
11 resolv.conf.
12 - ``dns_search``: Specify a list of search paths to be included in
13 resolv.conf.

Subscribers

People subscribed via source and target branches