Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixops
base: e4324e4faf49
Choose a base ref
...
head repository: NixOS/nixops
compare: 448bd533c324
Choose a head ref
  • 9 commits
  • 4 files changed
  • 2 contributors

Commits on Aug 24, 2018

  1. Copy the full SHA
    91a3f38 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    ab95022 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2018

  1. Copy the full SHA
    13ade59 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    0dc04d4 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2018

  1. Refactor check subroutines used by _check and create

    Fix an issue with real_state_differ check, GCP API adds the region and
    the project name to the network so we need to remove those before
    checking if the network in the state match.
    benhamad committed Aug 30, 2018
    Copy the full SHA
    4a47c18 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2018

  1. GCERoute: Support specifying machine resources in destination and nex…

    …tHop
    
    Example:
    
    ```
    {}:{
      machine =
        { config, pkgs, resources, lib, ... }:
        let
        in
        {
          deployment.targetEnv = "gce";
          ....
        };
    
      ec2machine = {resources, lib, ...}:
      {
        deployment.targetEnv = "ec2";
        ...
    
      };
      resources.gceRoutes.lb-default = {resources, ...}:{
        destination = resources.machines.ec2machine;
        priority = 800;
        nextHop = resources.machines.machine ;
        tags = [ "workers" ] ;
      };
    
    }
    ```
    
    Be aware that nextHop can only be a GCE machine, if not an exception
    will be raised
    benhamad committed Sep 2, 2018
    Copy the full SHA
    140b259 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2018

  1. GCERoute: Implement create_after to wait for machines to be ready

    If nextHop or destination is a machine, wait for them to be deployed
    before creating the route.
    benhamad committed Sep 4, 2018
    Copy the full SHA
    e19e253 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    761d012 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #993 from Chakerbh/gce-routes

    Add a resource for GCE routes
    AmineChikhaoui committed Sep 4, 2018
    Copy the full SHA
    448bd53 View commit details
    Browse the repository at this point in the history