#216 Use inventory in debug, use constants everywhere
Closed 5 years ago by till. Opened 5 years ago by till.
till/standard-test-roles various_cleanups  into  master

@@ -56,6 +56,7 @@ 

  

  DEF_USER = "root"

  DEF_PASSWD = "foobar"

+ DEF_HOST = "127.0.0.3"

  

  USER_DATA = """#cloud-config

  users:
@@ -116,7 +117,7 @@ 

          sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

          sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)

          try:

-             sock.bind(("127.0.0.3", port))

+             sock.bind((DEF_HOST, port))

          except IOError:

              pass

          else:
@@ -219,9 +220,9 @@ 

              # The variables

              variables = {

                  "ansible_port": "{0}".format(port),

-                 "ansible_host": "127.0.0.3",

-                 "ansible_user": "root",

-                 "ansible_ssh_pass": "foobar",

+                 "ansible_host": DEF_HOST,

+                 "ansible_user": DEF_USER,

+                 "ansible_ssh_pass": DEF_PASSWD,

                  "ansible_ssh_private_key_file": identity,

                  "ansible_ssh_common_args": "-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"

              }
@@ -327,8 +328,12 @@ 

  

      if diagnose:

          sys.stderr.write("\n")

-         sys.stderr.write("DIAGNOSE: ssh -p {0} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "

-                          "root@{1} # password: {2}\n".format(port, "127.0.0.3", "foobar"))

+         sys.stderr.write("DIAGNOSE: ssh -p {port} -o StrictHostKeyChecking=no "

+                          "-o UserKnownHostsFile=/dev/null -i {identity} "

+                          "{user}@{host}\n".format(port=port, identity=identity,

+                                                   user=DEF_USER, host=DEF_HOST

+                                                  ))

+         sys.stderr.write("DIAGNOSE: Passwort is: {}".format(DEF_PASSWD))

          sys.stderr.write("DIAGNOSE: export ANSIBLE_INVENTORY={0}\n".format(inventory))

          sys.stderr.write("DIAGNOSE: kill {0} # when finished\n".format(os.getpid()))

  

no initial comment

pretty please pagure-ci rebuild

https://jenkins-fedora-atomic-process.apps.ci.centos.org/job/str_pr_test/128/console

/home/jenkins/workspace/str_pr_test/inventory/standard-inventory-qcow2:335:26: E124 closing bracket does not match visual indentation

rebased onto c1463e8

5 years ago

Pull-Request has been closed by till

5 years ago