[MediaWiki-commits] [Gerrit] Rename virt1010 to labvirt1009 - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged. Change subject: Rename virt1010 to labvirt1009 .. Rename virt1010 to labvirt1009 This is the last of the HPs to be renamed. This patch also removes the site.pp and hiera definition for the old names. Change-Id: I3d54aaea62036d79e5e45e0d5b0151eafb8ce0cb --- D hieradata/hosts/virt1010.yaml D hieradata/hosts/virt1011.yaml M manifests/site.pp M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 4 files changed, 5 insertions(+), 20 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/hosts/virt1010.yaml b/hieradata/hosts/virt1010.yaml deleted file mode 100644 index 0f97ce9..000 --- a/hieradata/hosts/virt1010.yaml +++ /dev/null @@ -1 +0,0 @@ -role::nova::compute::instance_dev: "/dev/sdb1" diff --git a/hieradata/hosts/virt1011.yaml b/hieradata/hosts/virt1011.yaml deleted file mode 100644 index 0f97ce9..000 --- a/hieradata/hosts/virt1011.yaml +++ /dev/null @@ -1 +0,0 @@ -role::nova::compute::instance_dev: "/dev/sdb1" diff --git a/manifests/site.pp b/manifests/site.pp index 21c19f6..b7443a5 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2407,17 +2407,6 @@ } } -node /^virt101[0-2].eqiad.wmnet/ { -$use_neutron = false -openstack::nova::partition{ '/dev/sdb': } -role nova::compute -include standard - -if $use_neutron == true { -include role::neutron::computenode -} -} - node /^labvirt100[0-9].eqiad.wmnet/ { $use_neutron = false openstack::nova::partition{ '/dev/sdb': } diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 index 0e70080..46726a8 100644 --- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -2458,6 +2458,11 @@ fixed-address labvirt1008.eqiad.wmnet; } +host labvirt1009 { + hardware ethernet 40:a8:f0:38:06:40; + fixed-address labvirt1009.eqiad.wmnet; +} + host lanthanum { hardware ethernet 90:B1:1C:00:A2:67; fixed-address lanthanum.eqiad.wmnet; @@ -5831,13 +5836,6 @@ host virt1000 { hardware ethernet 18:03:73:f5:2c:2b; fixed-address virt1000.wikimedia.org; -} - -host virt1010 { - hardware ethernet 40:a8:f0:38:06:40; - fixed-address virt1010.eqiad.wmnet; - option pxelinux.pathprefix "precise-installer/"; - filename "precise-installer/ubuntu-installer/amd64/pxelinux.0"; } host wtp1001 { -- To view, visit https://gerrit.wikimedia.org/r/209220 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3d54aaea62036d79e5e45e0d5b0151eafb8ce0cb Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott Gerrit-Reviewer: Andrew Bogott Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename virt1010 to labvirt1009 - change (operations/puppet)
Andrew Bogott has uploaded a new change for review. https://gerrit.wikimedia.org/r/209220 Change subject: Rename virt1010 to labvirt1009 .. Rename virt1010 to labvirt1009 This is the last of the HPs to be renamed. This patch also removes the site.pp and hiera definition for the old names. Change-Id: I3d54aaea62036d79e5e45e0d5b0151eafb8ce0cb --- D hieradata/hosts/virt1010.yaml D hieradata/hosts/virt1011.yaml M manifests/site.pp M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 4 files changed, 5 insertions(+), 20 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/20/209220/1 diff --git a/hieradata/hosts/virt1010.yaml b/hieradata/hosts/virt1010.yaml deleted file mode 100644 index 0f97ce9..000 --- a/hieradata/hosts/virt1010.yaml +++ /dev/null @@ -1 +0,0 @@ -role::nova::compute::instance_dev: "/dev/sdb1" diff --git a/hieradata/hosts/virt1011.yaml b/hieradata/hosts/virt1011.yaml deleted file mode 100644 index 0f97ce9..000 --- a/hieradata/hosts/virt1011.yaml +++ /dev/null @@ -1 +0,0 @@ -role::nova::compute::instance_dev: "/dev/sdb1" diff --git a/manifests/site.pp b/manifests/site.pp index 21c19f6..b7443a5 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2407,17 +2407,6 @@ } } -node /^virt101[0-2].eqiad.wmnet/ { -$use_neutron = false -openstack::nova::partition{ '/dev/sdb': } -role nova::compute -include standard - -if $use_neutron == true { -include role::neutron::computenode -} -} - node /^labvirt100[0-9].eqiad.wmnet/ { $use_neutron = false openstack::nova::partition{ '/dev/sdb': } diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 index 0e70080..46726a8 100644 --- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -2458,6 +2458,11 @@ fixed-address labvirt1008.eqiad.wmnet; } +host labvirt1009 { + hardware ethernet 40:a8:f0:38:06:40; + fixed-address labvirt1009.eqiad.wmnet; +} + host lanthanum { hardware ethernet 90:B1:1C:00:A2:67; fixed-address lanthanum.eqiad.wmnet; @@ -5831,13 +5836,6 @@ host virt1000 { hardware ethernet 18:03:73:f5:2c:2b; fixed-address virt1000.wikimedia.org; -} - -host virt1010 { - hardware ethernet 40:a8:f0:38:06:40; - fixed-address virt1010.eqiad.wmnet; - option pxelinux.pathprefix "precise-installer/"; - filename "precise-installer/ubuntu-installer/amd64/pxelinux.0"; } host wtp1001 { -- To view, visit https://gerrit.wikimedia.org/r/209220 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3d54aaea62036d79e5e45e0d5b0151eafb8ce0cb Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits