Skip to content

Get away from master/slave words #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bopopescu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Get away from master/slave words #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions yaml-tools/yaml-tools/usr/bin/mk_cobbler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,21 @@ def print_dl3x0_prod():
--name=${ORG}_${MACH}_${P}${NAME} \\
--interface=${ETH1_NAME} \\
--mac=${MAC_ETH1} \\
--bonding=slave \\
--bonding-master=bond0
--bonding=subordinate \\
--bonding-main=bond0

$COBBLER system edit \\
--name=${ORG}_${MACH}_${P}${NAME} \\
--interface=${ETH2_NAME} \\
--mac=${MAC_ETH2} \\
--bonding=slave \\
--bonding-master=bond0
--bonding=subordinate \\
--bonding-main=bond0

$COBBLER system edit \\
--name=${ORG}_${MACH}_${P}${NAME} \\
--interface=bond0 \\
--mac=${MAC_ETH1} \\
--bonding=master \\
--bonding=main \\
--bonding-opts="mode=1 primary=${ETH1_NAME} miimon=100" \\
--static=1 \\
--ip-address=${PROD_IP} \\
Expand All @@ -75,21 +75,21 @@ def print_dl3x0_cic():
--name=${ORG}_${MACH}_${P}${NAME} \\
--interface=${ETH3_NAME} \\
--mac=${MAC_ETH3} \\
--bonding=slave \\
--bonding-master=bond1
--bonding=subordinate \\
--bonding-main=bond1

$COBBLER system edit \\
--name=${ORG}_${MACH}_${P}${NAME} \\
--interface=${ETH4_NAME} \\
--mac=${MAC_ETH4} \\
--bonding=slave \\
--bonding-master=bond1
--bonding=subordinate \\
--bonding-main=bond1

$COBBLER system edit \\
--name=${ORG}_${MACH}_${P}${NAME} \\
--interface=bond1 \\
--mac=${MAC_ETH3} \\
--bonding=master \\
--bonding=main \\
--bonding-opts="mode=1 primary=${ETH3_NAME} miimon=100" \\
--static=1 \\
--ip-address=${CLUSTER_IP} \\
Expand Down
24 changes: 12 additions & 12 deletions yaml-tools/yaml-tools/usr/bin/mk_zones_from_yaml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def node_to_dns(y, d, z, nameserver):

def write_custom_zone(z, fd):
print >> fd, '''zone "%(zone)s." IN {
type master;
type main;
file "%(zone)s.zone";
notify yes;
allow-transfer { any; };
Expand All @@ -106,7 +106,7 @@ def write_custom_arpa(a, fd):
rev.reverse()
rev = '.'.join(rev)
print >> fd, '''zone "%(rev)s.in-addr.arpa." IN {
type master;
type main;
file "%(arpa)s.in-addr.arpa";
notify yes;
allow-transfer { any; };
Expand Down Expand Up @@ -151,17 +151,17 @@ def write_zone_file(zone, fd):
; NN is the daily sequence number.
; After editing this file, always
; update this serial number to give
; slaves a chance to keep
; subordinates a chance to keep
; synchronized.
%(refresh)s ; refresh. The refresh interval
; tells a slave for the zone how
; tells a subordinate for the zone how
; often to check that the data for
; this zone is up to date.
%(retry)s ; retry. If a slave fails to connect
; to the master, it will retry in
%(retry)s ; retry. If a subordinate fails to connect
; to the main, it will retry in
; this amount of time. So here it is
; 15 minutes.
%(expiry)s ; expiry. If a slave did not contact
%(expiry)s ; expiry. If a subordinate did not contact
; the server for this amount of
; time, its records become useless,
; i.e. are expired.
Expand Down Expand Up @@ -193,17 +193,17 @@ def write_arpa_file(arpa, fd):
; NN is the daily sequence number.
; After editing this file, always
; update this serial number to give
; slaves a chance to keep
; subordinates a chance to keep
; synchronized.
%(refresh)s ; refresh. The refresh interval
; tells a slave for the zone how
; tells a subordinate for the zone how
; often to check that the data for
; this zone is up to date.
%(retry)s ; retry. If a slave fails to connect
; to the master, it will retry in
%(retry)s ; retry. If a subordinate fails to connect
; to the main, it will retry in
; this amount of time. So here it is
; 15 minutes.
%(expiry)s ; expiry. If a slave did not contact
%(expiry)s ; expiry. If a subordinate did not contact
; the server for this amount of
; time, its records become useless,
; i.e. are expired.
Expand Down