Fix svc to point to nova-api pod housing the metadata server

Also bumps the test timeout up as it sometimes fails now due
to too many tests.

TrivialFix

Change-Id: If486a21cb800bd504dcd011aae74113568d0d026

.testr.conf

@@ -1,7 +1,7 @@
 [DEFAULT]
 test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
              OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
-             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
+             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-240} \
              ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list

etc/kolla-kubernetes/service_resources.yml

@@ -299,7 +299,7 @@ kolla-kubernetes:
         vars:
           port_name: nova_metadata_port
           service: nova
-          type: metadata
+          type: api
           name: nova-metadata
       bootstrap:
       - name: nova-compute-bootstrap