From 8ec165da26f863b2c40459d152a8f0a83cebed7d Mon Sep 17 00:00:00 2001 From: Alejandro Huertas Herrero Date: Fri, 28 Jan 2022 14:04:05 +0100 Subject: [PATCH] F #5593: add default frr iface for AWS (#1723) (cherry picked from commit 27e4ef52d4fd05b70f4ba8b628775de89c4ecae6) --- .../edge-clusters/metal/providers/aws/aws-eu-central-1.yml | 2 ++ .../edge-clusters/metal/providers/aws/aws-eu-west-2.yml | 2 ++ .../edge-clusters/metal/providers/aws/aws-us-east-1.yml | 2 ++ .../edge-clusters/metal/providers/aws/aws-us-west-1.yml | 2 ++ .../edge-clusters/metal/providers/equinix/equinix-ams1.yml | 2 ++ .../edge-clusters/metal/providers/equinix/equinix-ewr1.yml | 2 ++ .../edge-clusters/metal/providers/equinix/equinix-nrt1.yml | 2 ++ .../edge-clusters/metal/providers/equinix/equinix-sjc1.yml | 2 ++ .../edge-clusters/metal/providers/vultr/vultr-ams.yml | 2 ++ .../edge-clusters/metal/providers/vultr/vultr-lhr.yml | 2 ++ .../edge-clusters/metal/providers/vultr/vultr-ord.yml | 2 ++ .../edge-clusters/metal/providers/vultr/vultr-sjc.yml | 2 ++ .../edge-clusters/metal/provisions/aws.d/inputs.yml | 1 + .../edge-clusters/virtual/providers/aws/aws-eu-central-1.yml | 2 ++ .../edge-clusters/virtual/providers/aws/aws-eu-west-2.yml | 2 ++ .../edge-clusters/virtual/providers/aws/aws-us-east-1.yml | 2 ++ .../edge-clusters/virtual/providers/aws/aws-us-west-1.yml | 2 ++ .../edge-clusters/virtual/providers/digitalocean/do-ams3.yml | 3 ++- .../edge-clusters/virtual/providers/digitalocean/do-lon1.yml | 3 ++- .../edge-clusters/virtual/providers/digitalocean/do-nyc3.yml | 3 ++- .../edge-clusters/virtual/providers/digitalocean/do-sfo3.yml | 3 ++- .../edge-clusters/virtual/providers/digitalocean/do-sgp1.yml | 3 ++- .../virtual/providers/google/google-europe-west1-b.yml | 2 ++ .../virtual/providers/google/google-europe-west2-b.yml | 2 ++ .../virtual/providers/google/google-us-east1-b.yml | 2 ++ .../virtual/providers/google/google-us-west1-b.yml | 2 ++ .../edge-clusters/virtual/providers/vultr/vultr-ams.yml | 4 +++- .../edge-clusters/virtual/providers/vultr/vultr-lhr.yml | 4 +++- .../edge-clusters/virtual/providers/vultr/vultr-ord.yml | 4 +++- .../edge-clusters/virtual/providers/vultr/vultr-sjc.yml | 4 +++- .../edge-clusters/virtual/provisions/aws.d/inputs.yml | 1 + 31 files changed, 64 insertions(+), 9 deletions(-) diff --git a/share/oneprovision/edge-clusters/metal/providers/aws/aws-eu-central-1.yml b/share/oneprovision/edge-clusters/metal/providers/aws/aws-eu-central-1.yml index 7620a0f1d6..b254501bd2 100644 --- a/share/oneprovision/edge-clusters/metal/providers/aws/aws-eu-central-1.yml +++ b/share/oneprovision/edge-clusters/metal/providers/aws/aws-eu-central-1.yml @@ -11,10 +11,12 @@ connection: inputs: - name: 'aws_ami_image' type: 'list' + default: 'ami-04505e74c0741db8d' options: - 'ami-04505e74c0741db8d' - name: 'aws_instance_type' type: 'list' + default: 'c5.metal' options: - 'c5.metal' - 'i3.metal' diff --git a/share/oneprovision/edge-clusters/metal/providers/aws/aws-eu-west-2.yml b/share/oneprovision/edge-clusters/metal/providers/aws/aws-eu-west-2.yml index eb2a601dd8..08be004f0b 100644 --- a/share/oneprovision/edge-clusters/metal/providers/aws/aws-eu-west-2.yml +++ b/share/oneprovision/edge-clusters/metal/providers/aws/aws-eu-west-2.yml @@ -11,10 +11,12 @@ connection: inputs: - name: 'aws_ami_image' type: 'list' + default: 'ami-04505e74c0741db8d' options: - 'ami-04505e74c0741db8d' - name: 'aws_instance_type' type: 'list' + default: 'c5.metal' options: - 'c5.metal' - 'i3.metal' diff --git a/share/oneprovision/edge-clusters/metal/providers/aws/aws-us-east-1.yml b/share/oneprovision/edge-clusters/metal/providers/aws/aws-us-east-1.yml index 702b001314..2bbea0ba35 100644 --- a/share/oneprovision/edge-clusters/metal/providers/aws/aws-us-east-1.yml +++ b/share/oneprovision/edge-clusters/metal/providers/aws/aws-us-east-1.yml @@ -11,10 +11,12 @@ connection: inputs: - name: 'aws_ami_image' type: 'list' + default: 'ami-04505e74c0741db8d' options: - 'ami-04505e74c0741db8d' - name: 'aws_instance_type' type: 'list' + default: 'c5.metal' options: - 'c5.metal' - 'i3.metal' diff --git a/share/oneprovision/edge-clusters/metal/providers/aws/aws-us-west-1.yml b/share/oneprovision/edge-clusters/metal/providers/aws/aws-us-west-1.yml index 6b6338e6ae..f3cc943ef3 100644 --- a/share/oneprovision/edge-clusters/metal/providers/aws/aws-us-west-1.yml +++ b/share/oneprovision/edge-clusters/metal/providers/aws/aws-us-west-1.yml @@ -11,10 +11,12 @@ connection: inputs: - name: 'aws_ami_image' type: 'list' + default: 'ami-04505e74c0741db8d' options: - 'ami-04505e74c0741db8d' - name: 'aws_instance_type' type: 'list' + default: 'c5.metal' options: - 'c5.metal' - 'i3.metal' diff --git a/share/oneprovision/edge-clusters/metal/providers/equinix/equinix-ams1.yml b/share/oneprovision/edge-clusters/metal/providers/equinix/equinix-ams1.yml index 5565744769..ac3554152d 100644 --- a/share/oneprovision/edge-clusters/metal/providers/equinix/equinix-ams1.yml +++ b/share/oneprovision/edge-clusters/metal/providers/equinix/equinix-ams1.yml @@ -11,10 +11,12 @@ connection: inputs: - name: 'equinix_os' type: 'list' + default: 'ubuntu_20_04' options: - 'ubuntu_20_04' - name: 'equinix_plan' type: 'list' + default: 't1.small' options: - 't1.small' - 'c1.small' diff --git a/share/oneprovision/edge-clusters/metal/providers/equinix/equinix-ewr1.yml b/share/oneprovision/edge-clusters/metal/providers/equinix/equinix-ewr1.yml index 189c2d8457..cdefd4cce8 100644 --- a/share/oneprovision/edge-clusters/metal/providers/equinix/equinix-ewr1.yml +++ b/share/oneprovision/edge-clusters/metal/providers/equinix/equinix-ewr1.yml @@ -11,10 +11,12 @@ connection: inputs: - name: 'equinix_os' type: 'list' + default: 'ubuntu_20_04' options: - 'ubuntu_20_04' - name: 'equinix_plan' type: 'list' + default: 't1.small' options: - 't1.small' - 'c1.small' diff --git a/share/oneprovision/edge-clusters/metal/providers/equinix/equinix-nrt1.yml b/share/oneprovision/edge-clusters/metal/providers/equinix/equinix-nrt1.yml index 1b44b0ef76..3a9f33cdd9 100644 --- a/share/oneprovision/edge-clusters/metal/providers/equinix/equinix-nrt1.yml +++ b/share/oneprovision/edge-clusters/metal/providers/equinix/equinix-nrt1.yml @@ -11,10 +11,12 @@ connection: inputs: - name: 'equinix_os' type: 'list' + default: 'ubuntu_20_04' options: - 'ubuntu_20_04' - name: 'equinix_plan' type: 'list' + default: 't1.small' options: - 't1.small' - 'c1.small' diff --git a/share/oneprovision/edge-clusters/metal/providers/equinix/equinix-sjc1.yml b/share/oneprovision/edge-clusters/metal/providers/equinix/equinix-sjc1.yml index e8d083d375..5acf13a1a5 100644 --- a/share/oneprovision/edge-clusters/metal/providers/equinix/equinix-sjc1.yml +++ b/share/oneprovision/edge-clusters/metal/providers/equinix/equinix-sjc1.yml @@ -11,10 +11,12 @@ connection: inputs: - name: 'equinix_os' type: 'list' + default: 'ubuntu_20_04' options: - 'ubuntu_20_04' - name: 'equinix_plan' type: 'list' + default: 't1.small' options: - 't1.small' - 'c1.small' diff --git a/share/oneprovision/edge-clusters/metal/providers/vultr/vultr-ams.yml b/share/oneprovision/edge-clusters/metal/providers/vultr/vultr-ams.yml index 733c9271e6..70e8d41d38 100644 --- a/share/oneprovision/edge-clusters/metal/providers/vultr/vultr-ams.yml +++ b/share/oneprovision/edge-clusters/metal/providers/vultr/vultr-ams.yml @@ -10,9 +10,11 @@ connection: inputs: - name: 'vultr_os' type: 'list' + default: '387' options: - '387' - name: 'vultr_plan' type: 'list' + default: 'vbm-4c-32gb' options: - 'vbm-4c-32gb' diff --git a/share/oneprovision/edge-clusters/metal/providers/vultr/vultr-lhr.yml b/share/oneprovision/edge-clusters/metal/providers/vultr/vultr-lhr.yml index 18faaa0ee3..161c2b36b5 100644 --- a/share/oneprovision/edge-clusters/metal/providers/vultr/vultr-lhr.yml +++ b/share/oneprovision/edge-clusters/metal/providers/vultr/vultr-lhr.yml @@ -10,9 +10,11 @@ connection: inputs: - name: 'vultr_os' type: 'list' + default: '387' options: - '387' - name: 'vultr_plan' type: 'list' + default: 'vbm-4c-32gb' options: - 'vbm-4c-32gb' diff --git a/share/oneprovision/edge-clusters/metal/providers/vultr/vultr-ord.yml b/share/oneprovision/edge-clusters/metal/providers/vultr/vultr-ord.yml index aa9a8b8599..40bb520dff 100644 --- a/share/oneprovision/edge-clusters/metal/providers/vultr/vultr-ord.yml +++ b/share/oneprovision/edge-clusters/metal/providers/vultr/vultr-ord.yml @@ -10,9 +10,11 @@ connection: inputs: - name: 'vultr_os' type: 'list' + default: '387' options: - '387' - name: 'vultr_plan' type: 'list' + default: 'vbm-4c-32gb' options: - 'vbm-4c-32gb' diff --git a/share/oneprovision/edge-clusters/metal/providers/vultr/vultr-sjc.yml b/share/oneprovision/edge-clusters/metal/providers/vultr/vultr-sjc.yml index 296310f75d..6ca2e41ef9 100644 --- a/share/oneprovision/edge-clusters/metal/providers/vultr/vultr-sjc.yml +++ b/share/oneprovision/edge-clusters/metal/providers/vultr/vultr-sjc.yml @@ -10,9 +10,11 @@ connection: inputs: - name: 'vultr_os' type: 'list' + default: '387' options: - '387' - name: 'vultr_plan' type: 'list' + default: 'vbm-4c-32gb' options: - 'vbm-4c-32gb' diff --git a/share/oneprovision/edge-clusters/metal/provisions/aws.d/inputs.yml b/share/oneprovision/edge-clusters/metal/provisions/aws.d/inputs.yml index b58c29e0ad..e3498e867c 100644 --- a/share/oneprovision/edge-clusters/metal/provisions/aws.d/inputs.yml +++ b/share/oneprovision/edge-clusters/metal/provisions/aws.d/inputs.yml @@ -53,4 +53,5 @@ inputs: - name: 'private_phydev' type: text description: 'Physical device to be used for private networking.' + default: 'ens6' ... diff --git a/share/oneprovision/edge-clusters/virtual/providers/aws/aws-eu-central-1.yml b/share/oneprovision/edge-clusters/virtual/providers/aws/aws-eu-central-1.yml index 50750ed690..f1e9e77242 100644 --- a/share/oneprovision/edge-clusters/virtual/providers/aws/aws-eu-central-1.yml +++ b/share/oneprovision/edge-clusters/virtual/providers/aws/aws-eu-central-1.yml @@ -11,10 +11,12 @@ connection: inputs: - name: 'aws_ami_image' type: 'list' + default: 'ami-04505e74c0741db8d' options: - 'ami-04505e74c0741db8d' - name: 'aws_instance_type' type: 'list' + default: 't2.micro' options: - 't2.micro' - 't2.small' diff --git a/share/oneprovision/edge-clusters/virtual/providers/aws/aws-eu-west-2.yml b/share/oneprovision/edge-clusters/virtual/providers/aws/aws-eu-west-2.yml index d481133b1e..ea4372b24c 100644 --- a/share/oneprovision/edge-clusters/virtual/providers/aws/aws-eu-west-2.yml +++ b/share/oneprovision/edge-clusters/virtual/providers/aws/aws-eu-west-2.yml @@ -11,10 +11,12 @@ connection: inputs: - name: 'aws_ami_image' type: 'list' + default: 'ami-04505e74c0741db8d' options: - 'ami-04505e74c0741db8d' - name: 'aws_instance_type' type: 'list' + default: 't2.micro' options: - 't2.micro' - 't2.small' diff --git a/share/oneprovision/edge-clusters/virtual/providers/aws/aws-us-east-1.yml b/share/oneprovision/edge-clusters/virtual/providers/aws/aws-us-east-1.yml index 513c52c738..1186a1b1a0 100644 --- a/share/oneprovision/edge-clusters/virtual/providers/aws/aws-us-east-1.yml +++ b/share/oneprovision/edge-clusters/virtual/providers/aws/aws-us-east-1.yml @@ -11,10 +11,12 @@ connection: inputs: - name: 'aws_ami_image' type: 'list' + default: 'ami-04505e74c0741db8d' options: - 'ami-04505e74c0741db8d' - name: 'aws_instance_type' type: 'list' + default: 't2.micro' options: - 't2.micro' - 't2.small' diff --git a/share/oneprovision/edge-clusters/virtual/providers/aws/aws-us-west-1.yml b/share/oneprovision/edge-clusters/virtual/providers/aws/aws-us-west-1.yml index 23fb365fb5..c3e3f0bb86 100644 --- a/share/oneprovision/edge-clusters/virtual/providers/aws/aws-us-west-1.yml +++ b/share/oneprovision/edge-clusters/virtual/providers/aws/aws-us-west-1.yml @@ -11,10 +11,12 @@ connection: inputs: - name: 'aws_ami_image' type: 'list' + default: 'ami-04505e74c0741db8d' options: - 'ami-04505e74c0741db8d' - name: 'aws_instance_type' type: 'list' + default: 't2.micro' options: - 't2.micro' - 't2.small' diff --git a/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-ams3.yml b/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-ams3.yml index 576825b682..2fa7ea32a7 100644 --- a/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-ams3.yml +++ b/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-ams3.yml @@ -11,12 +11,13 @@ inputs: - name: 'digitalocean_image' type: list description: "Droplet host operating system" + default: 'ubuntu-20-04-x64' options: - 'ubuntu-20-04-x64' - - name: 'digitalocean_size' type: list description: "Size of droplet. Basic droplets start with s-, memory optimize with m- and CPU optimize are c-" + default: 's-1vcpu-1gb' options: - 's-1vcpu-1gb' - 's-1vcpu-2gb' diff --git a/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-lon1.yml b/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-lon1.yml index 08935dc43f..66cfc9d5c9 100644 --- a/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-lon1.yml +++ b/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-lon1.yml @@ -11,12 +11,13 @@ inputs: - name: 'digitalocean_image' type: list description: "Droplet host operating system" + default: 'ubuntu-20-04-x64' options: - 'ubuntu-20-04-x64' - - name: 'digitalocean_size' type: list description: "Size of droplet. Basic droplets start with s-, memory optimize with m- and CPU optimize are c-" + default: 's-1vcpu-1gb' options: - 's-1vcpu-1gb' - 's-1vcpu-2gb' diff --git a/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-nyc3.yml b/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-nyc3.yml index e357bd4053..a58db00ed6 100644 --- a/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-nyc3.yml +++ b/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-nyc3.yml @@ -11,12 +11,13 @@ inputs: - name: 'digitalocean_image' type: list description: "Droplet host operating system" + default: 'ubuntu-20-04-x64' options: - 'ubuntu-20-04-x64' - - name: 'digitalocean_size' type: list description: "Size of droplet. Basic droplets start with s-, memory optimize with m- and CPU optimize are c-" + default: 's-1vcpu-1gb' options: - 's-1vcpu-1gb' - 's-1vcpu-2gb' diff --git a/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-sfo3.yml b/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-sfo3.yml index 580b7761b6..2335b7d022 100644 --- a/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-sfo3.yml +++ b/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-sfo3.yml @@ -11,12 +11,13 @@ inputs: - name: 'digitalocean_image' type: list description: "Droplet host operating system" + default: 'ubuntu-20-04-x64' options: - 'ubuntu-20-04-x64' - - name: 'digitalocean_size' type: list description: "Size of droplet. Basic droplets start with s-, memory optimize with m- and CPU optimize are c-" + default: 's-1vcpu-1gb' options: - 's-1vcpu-1gb' - 's-1vcpu-2gb' diff --git a/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-sgp1.yml b/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-sgp1.yml index ef0cafabb5..ccf396267c 100644 --- a/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-sgp1.yml +++ b/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-sgp1.yml @@ -11,12 +11,13 @@ inputs: - name: 'digitalocean_image' type: list description: "Droplet host operating system" + default: 'ubuntu-20-04-x64' options: - 'ubuntu-20-04-x64' - - name: 'digitalocean_size' type: list description: "Size of droplet. Basic droplets start with s-, memory optimize with m- and CPU optimize are c-" + default: 's-1vcpu-1gb' options: - 's-1vcpu-1gb' - 's-1vcpu-2gb' diff --git a/share/oneprovision/edge-clusters/virtual/providers/google/google-europe-west1-b.yml b/share/oneprovision/edge-clusters/virtual/providers/google/google-europe-west1-b.yml index c90bad7bb2..3f7b7f6e3b 100644 --- a/share/oneprovision/edge-clusters/virtual/providers/google/google-europe-west1-b.yml +++ b/share/oneprovision/edge-clusters/virtual/providers/google/google-europe-west1-b.yml @@ -12,10 +12,12 @@ connection: inputs: - name: 'google_image' type: 'list' + default: 'ubuntu-2004-focal-v20220118' options: - 'ubuntu-2004-focal-v20220118' - name: 'google_machine_type' type: 'list' + default: 'e2-standard-2' options: - 'e2-standard-2' - 'e2-standard-4' diff --git a/share/oneprovision/edge-clusters/virtual/providers/google/google-europe-west2-b.yml b/share/oneprovision/edge-clusters/virtual/providers/google/google-europe-west2-b.yml index 53f2220b70..9de97b101a 100644 --- a/share/oneprovision/edge-clusters/virtual/providers/google/google-europe-west2-b.yml +++ b/share/oneprovision/edge-clusters/virtual/providers/google/google-europe-west2-b.yml @@ -12,10 +12,12 @@ connection: inputs: - name: 'google_image' type: 'list' + default: 'ubuntu-2004-focal-v20220118' options: - 'ubuntu-2004-focal-v20220118' - name: 'google_machine_type' type: 'list' + default: 'e2-standard-2' options: - 'e2-standard-2' - 'e2-standard-4' diff --git a/share/oneprovision/edge-clusters/virtual/providers/google/google-us-east1-b.yml b/share/oneprovision/edge-clusters/virtual/providers/google/google-us-east1-b.yml index 651c0ca6c8..5d388051c7 100644 --- a/share/oneprovision/edge-clusters/virtual/providers/google/google-us-east1-b.yml +++ b/share/oneprovision/edge-clusters/virtual/providers/google/google-us-east1-b.yml @@ -12,10 +12,12 @@ connection: inputs: - name: 'google_image' type: 'list' + default: 'ubuntu-2004-focal-v20220118' options: - 'ubuntu-2004-focal-v20220118' - name: 'google_machine_type' type: 'list' + default: 'e2-standard-2' options: - 'e2-standard-2' - 'e2-standard-4' diff --git a/share/oneprovision/edge-clusters/virtual/providers/google/google-us-west1-b.yml b/share/oneprovision/edge-clusters/virtual/providers/google/google-us-west1-b.yml index ee6aa7a86c..facc962db5 100644 --- a/share/oneprovision/edge-clusters/virtual/providers/google/google-us-west1-b.yml +++ b/share/oneprovision/edge-clusters/virtual/providers/google/google-us-west1-b.yml @@ -12,10 +12,12 @@ connection: inputs: - name: 'google_image' type: 'list' + default: 'ubuntu-2004-focal-v20220118' options: - 'ubuntu-2004-focal-v20220118' - name: 'google_machine_type' type: 'list' + default: 'e2-standard-2' options: - 'e2-standard-2' - 'e2-standard-4' diff --git a/share/oneprovision/edge-clusters/virtual/providers/vultr/vultr-ams.yml b/share/oneprovision/edge-clusters/virtual/providers/vultr/vultr-ams.yml index c695c166b9..79f3faf6e2 100644 --- a/share/oneprovision/edge-clusters/virtual/providers/vultr/vultr-ams.yml +++ b/share/oneprovision/edge-clusters/virtual/providers/vultr/vultr-ams.yml @@ -10,10 +10,12 @@ connection: inputs: - name: 'vultr_os' type: 'list' + default: '387' options: - - '362' + - '387' - name: 'vultr_plan' type: 'list' + default: 'vc2-1c-1gb' options: - 'vc2-1c-1gb' - 'vc2-1c-2gb' diff --git a/share/oneprovision/edge-clusters/virtual/providers/vultr/vultr-lhr.yml b/share/oneprovision/edge-clusters/virtual/providers/vultr/vultr-lhr.yml index 9e74bc3ed6..28327bb515 100644 --- a/share/oneprovision/edge-clusters/virtual/providers/vultr/vultr-lhr.yml +++ b/share/oneprovision/edge-clusters/virtual/providers/vultr/vultr-lhr.yml @@ -10,10 +10,12 @@ connection: inputs: - name: 'vultr_os' type: 'list' + default: '387' options: - - '362' + - '387' - name: 'vultr_plan' type: 'list' + default: 'vc2-1c-1gb' options: - 'vc2-1c-1gb' - 'vc2-1c-2gb' diff --git a/share/oneprovision/edge-clusters/virtual/providers/vultr/vultr-ord.yml b/share/oneprovision/edge-clusters/virtual/providers/vultr/vultr-ord.yml index c7c1ba9965..d099812903 100644 --- a/share/oneprovision/edge-clusters/virtual/providers/vultr/vultr-ord.yml +++ b/share/oneprovision/edge-clusters/virtual/providers/vultr/vultr-ord.yml @@ -10,10 +10,12 @@ connection: inputs: - name: 'vultr_os' type: 'list' + default: '387' options: - - '362' + - '387' - name: 'vultr_plan' type: 'list' + default: 'vc2-1c-1gb' options: - 'vc2-1c-1gb' - 'vc2-1c-2gb' diff --git a/share/oneprovision/edge-clusters/virtual/providers/vultr/vultr-sjc.yml b/share/oneprovision/edge-clusters/virtual/providers/vultr/vultr-sjc.yml index 7a761a57b7..e52645c9b7 100644 --- a/share/oneprovision/edge-clusters/virtual/providers/vultr/vultr-sjc.yml +++ b/share/oneprovision/edge-clusters/virtual/providers/vultr/vultr-sjc.yml @@ -10,10 +10,12 @@ connection: inputs: - name: 'vultr_os' type: 'list' + default: '387' options: - - '362' + - '387' - name: 'vultr_plan' type: 'list' + default: 'vc2-1c-1gb' options: - 'vc2-1c-1gb' - 'vc2-1c-2gb' diff --git a/share/oneprovision/edge-clusters/virtual/provisions/aws.d/inputs.yml b/share/oneprovision/edge-clusters/virtual/provisions/aws.d/inputs.yml index e07d530dac..20f3ab9d28 100644 --- a/share/oneprovision/edge-clusters/virtual/provisions/aws.d/inputs.yml +++ b/share/oneprovision/edge-clusters/virtual/provisions/aws.d/inputs.yml @@ -52,4 +52,5 @@ inputs: - name: 'private_phydev' type: text description: 'Physical device to be used for private networking.' + default: 'eth0' ...