launch: fix RAX rdns command-line tool
I'm not sure this ever worked ... plumb the arguments through correctly. Change-Id: Ibf2e90bddb831b3671b24c48a8f19b0285978d1e
This commit is contained in:
parent
07d453d4e6
commit
530e14e32b
@ -120,6 +120,7 @@ def rax_rdns(name, server_href, ip4, ip6, ttl, auth):
|
|||||||
|
|
||||||
r = session.post(url=rdns_url, headers=headers, json=rdns_json)
|
r = session.post(url=rdns_url, headers=headers, json=rdns_json)
|
||||||
logging.info("RDNS Done: %s %s" % (r.status_code, r.reason))
|
logging.info("RDNS Done: %s %s" % (r.status_code, r.reason))
|
||||||
|
logging.debug("RDNS return: %s" % r.json())
|
||||||
|
|
||||||
|
|
||||||
def set_rax_reverse_dns(cloud, server, ip4, ip6):
|
def set_rax_reverse_dns(cloud, server, ip4, ip6):
|
||||||
@ -145,13 +146,15 @@ def main():
|
|||||||
parser.add_argument('--config', dest='config',
|
parser.add_argument('--config', dest='config',
|
||||||
default='/etc/rax-rdns-auth.conf')
|
default='/etc/rax-rdns-auth.conf')
|
||||||
parser.add_argument('--ttl', dest='ttl', type=int, default=3600)
|
parser.add_argument('--ttl', dest='ttl', type=int, default=3600)
|
||||||
parser.add_argument('name')
|
group = parser.add_mutually_exclusive_group(required=True)
|
||||||
parser.add_argument('server_href', required=False,
|
group.add_argument('--name')
|
||||||
help='If server_href is not supplied then href, '
|
group.add_argument('--server-href', help='server href from RAX API')
|
||||||
'and ip addresses are fetched from the cloud '
|
parser.add_argument('--ip4', help='Required when not using href')
|
||||||
'using name.')
|
parser.add_argument('--ip6', help='Required when not using href')
|
||||||
parser.add_argument('ip4')
|
parser.add_argument('--cloud', default='openstackci-rax',
|
||||||
parser.add_argument('ip6')
|
help='Cloud config name when not using href')
|
||||||
|
parser.add_argument('--region', default='DFW', help='Region of server when not using href')
|
||||||
|
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
logging.basicConfig(level=logging.INFO)
|
logging.basicConfig(level=logging.INFO)
|
||||||
@ -166,7 +169,7 @@ def main():
|
|||||||
rax_rdns(args.name, args.server_href, args.ip4, args.ip6, args.ttl, auth)
|
rax_rdns(args.name, args.server_href, args.ip4, args.ip6, args.ttl, auth)
|
||||||
else:
|
else:
|
||||||
import openstack
|
import openstack
|
||||||
cloud = openstack.connect()
|
cloud = openstack.connect(cloud=args.cloud, region=args.region)
|
||||||
# Get the server using the shade layer so that we have server.public_v4
|
# Get the server using the shade layer so that we have server.public_v4
|
||||||
# and server.public_v6
|
# and server.public_v6
|
||||||
try:
|
try:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user