diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2021-03-18 20:02:07 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2022-02-05 23:33:10 +0300 |
| commit | 524aecf61e11663a3e841bee2e2b3a45a64ffdc2 (patch) | |
| tree | e92e82fd434c0754e29bc83dacd98cf1fc981df7 /nixos/tests/google-oslogin | |
| parent | 077d0524ccfec44c00b469833ad7b5d8a984e7f6 (diff) | |
google-compute-config: update config
Diffstat (limited to 'nixos/tests/google-oslogin')
| -rw-r--r-- | nixos/tests/google-oslogin/default.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/google-oslogin/server.nix | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | nixos/tests/google-oslogin/server.py | 0 |
3 files changed, 3 insertions, 5 deletions
diff --git a/nixos/tests/google-oslogin/default.nix b/nixos/tests/google-oslogin/default.nix index dea660ed05a48..72c87d7153bdf 100644 --- a/nixos/tests/google-oslogin/default.nix +++ b/nixos/tests/google-oslogin/default.nix @@ -31,10 +31,10 @@ in { # mockserver should return a non-expired ssh key for both mockuser and mockadmin server.succeed( - f'${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys {MOCKUSER} | grep -q "${snakeOilPublicKey}"' + f'${pkgs.google-guest-oslogin}/bin/google_authorized_keys {MOCKUSER} | grep -q "${snakeOilPublicKey}"' ) server.succeed( - f'${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys {MOCKADMIN} | grep -q "${snakeOilPublicKey}"' + f'${pkgs.google-guest-oslogin}/bin/google_authorized_keys {MOCKADMIN} | grep -q "${snakeOilPublicKey}"' ) # install snakeoil ssh key on the client, and provision .ssh/config file diff --git a/nixos/tests/google-oslogin/server.nix b/nixos/tests/google-oslogin/server.nix index a0a3144ae69f0..faf5e847d7e95 100644 --- a/nixos/tests/google-oslogin/server.nix +++ b/nixos/tests/google-oslogin/server.nix @@ -23,7 +23,5 @@ in { security.googleOsLogin.enable = true; # Mock google service - networking.extraHosts = '' - 127.0.0.1 metadata.google.internal - ''; + networking.interfaces.lo.ipv4.addresses = [ { address = "169.254.169.254"; prefixLength = 32; } ]; } diff --git a/nixos/tests/google-oslogin/server.py b/nixos/tests/google-oslogin/server.py index 5ea9bbd2c96ba..5ea9bbd2c96ba 100644..100755 --- a/nixos/tests/google-oslogin/server.py +++ b/nixos/tests/google-oslogin/server.py |