Merge "Fix approved methods list."
diff --git a/jenkins/client/job/deploy/update/upgrade.yml b/jenkins/client/job/deploy/update/upgrade.yml
index 7e94c10..6ffc9c1 100644
--- a/jenkins/client/job/deploy/update/upgrade.yml
+++ b/jenkins/client/job/deploy/update/upgrade.yml
@@ -44,3 +44,7 @@
type: boolean
default: 'false'
description: "Set to true if vms should not be recreated"
+ INTERACTIVE:
+ type: boolean
+ default: 'true'
+ description: "Ask interactive questions during pipeline run (bool)"
diff --git a/jenkins/client/job/deploy/update/upgrade_compute.yml b/jenkins/client/job/deploy/update/upgrade_compute.yml
index 90bfc76..3986997 100644
--- a/jenkins/client/job/deploy/update/upgrade_compute.yml
+++ b/jenkins/client/job/deploy/update/upgrade_compute.yml
@@ -35,3 +35,7 @@
type: string
default: '1'
description: Number of selected nodes to live apply upgrade.
+ INTERACTIVE:
+ type: boolean
+ default: 'true'
+ description: "Ask interactive questions during pipeline run (bool)"
diff --git a/jenkins/client/job/deploy/update/upgrade_ovs_gateway.yml b/jenkins/client/job/deploy/update/upgrade_ovs_gateway.yml
index 335492d..e7cdb12 100644
--- a/jenkins/client/job/deploy/update/upgrade_ovs_gateway.yml
+++ b/jenkins/client/job/deploy/update/upgrade_ovs_gateway.yml
@@ -35,3 +35,7 @@
type: string
default: '1'
description: Number of selected nodes to live apply upgrade.
+ INTERACTIVE:
+ type: boolean
+ default: 'true'
+ description: "Ask interactive questions during pipeline run (bool)"
diff --git a/salt/control/sizes/cicd/large.yml b/salt/control/sizes/cicd/large.yml
index 2ef4866..deb3722 100644
--- a/salt/control/sizes/cicd/large.yml
+++ b/salt/control/sizes/cicd/large.yml
@@ -2,5 +2,5 @@
_param:
salt_control_size_cpu_cicd_control: 8
salt_control_size_ram_cicd_control: 32768
- salt_control_size_disk_profile_cicd_control: xxlarge
+ salt_control_size_disk_profile_cicd_control: xxxlarge
salt_control_size_net_profile_cicd_control: default
\ No newline at end of file
diff --git a/salt/control/sizes/cicd/medium.yml b/salt/control/sizes/cicd/medium.yml
new file mode 100644
index 0000000..2ef4866
--- /dev/null
+++ b/salt/control/sizes/cicd/medium.yml
@@ -0,0 +1,6 @@
+parameters:
+ _param:
+ salt_control_size_cpu_cicd_control: 8
+ salt_control_size_ram_cicd_control: 32768
+ salt_control_size_disk_profile_cicd_control: xxlarge
+ salt_control_size_net_profile_cicd_control: default
\ No newline at end of file
diff --git a/salt/control/sizes/opencontrail/medium.yml b/salt/control/sizes/opencontrail/medium.yml
new file mode 100644
index 0000000..410092c
--- /dev/null
+++ b/salt/control/sizes/opencontrail/medium.yml
@@ -0,0 +1,10 @@
+parameters:
+ _param:
+ salt_control_size_cpu_opencontrail_control: 8
+ salt_control_size_ram_opencontrail_control: 65536
+ salt_control_size_disk_profile_opencontrail_control: large
+ salt_control_size_net_profile_opencontrail_control: default
+ salt_control_size_cpu_opencontrail_analytics: 16
+ salt_control_size_ram_opencontrail_analytics: 98304
+ salt_control_size_disk_profile_opencontrail_analytics: xhuge
+ salt_control_size_net_profile_opencontrail_analytics: default
\ No newline at end of file
diff --git a/salt/control/sizes/openstack/large.yml b/salt/control/sizes/openstack/large.yml
index 26a91d7..04aa0c4 100644
--- a/salt/control/sizes/openstack/large.yml
+++ b/salt/control/sizes/openstack/large.yml
@@ -10,11 +10,11 @@
salt_control_size_net_profile_openstack_database: default
salt_control_size_cpu_openstack_message_queue: 32
salt_control_size_ram_openstack_message_queue: 200704
- salt_control_size_disk_profile_openstack_message_queue: xxlarge
+ salt_control_size_disk_profile_openstack_message_queue: large
salt_control_size_net_profile_openstack_message_queue: default
salt_control_size_cpu_openstack_proxy: 8
salt_control_size_ram_openstack_proxy: 32768
- salt_control_size_disk_profile_openstack_proxy: medium
+ salt_control_size_disk_profile_openstack_proxy: large
salt_control_size_net_profile_openstack_proxy: default
salt_control_size_cpu_openstack_upgrade: 8
salt_control_size_ram_openstack_upgrade: 16384
diff --git a/salt/control/sizes/openstack/medium.yml b/salt/control/sizes/openstack/medium.yml
new file mode 100644
index 0000000..7fa5d24
--- /dev/null
+++ b/salt/control/sizes/openstack/medium.yml
@@ -0,0 +1,22 @@
+parameters:
+ _param:
+ salt_control_size_cpu_openstack_control: 16
+ salt_control_size_ram_openstack_control: 65536
+ salt_control_size_disk_profile_openstack_control: large
+ salt_control_size_net_profile_openstack_control: default
+ salt_control_size_cpu_openstack_database: 8
+ salt_control_size_ram_openstack_database: 32786
+ salt_control_size_disk_profile_openstack_database: large
+ salt_control_size_net_profile_openstack_database: default
+ salt_control_size_cpu_openstack_message_queue: 16
+ salt_control_size_ram_openstack_message_queue: 66553
+ salt_control_size_disk_profile_openstack_message_queue: large
+ salt_control_size_net_profile_openstack_message_queue: default
+ salt_control_size_cpu_openstack_proxy: 4
+ salt_control_size_ram_openstack_proxy: 16384
+ salt_control_size_disk_profile_openstack_proxy: small
+ salt_control_size_net_profile_openstack_proxy: default
+ salt_control_size_cpu_openstack_upgrade: 8
+ salt_control_size_ram_openstack_upgrade: 16384
+ salt_control_size_disk_profile_openstack_upgrade: medium
+ salt_control_size_net_profile_openstack_upgrade: default
\ No newline at end of file
diff --git a/salt/control/sizes/stacklight/compact.yml b/salt/control/sizes/stacklight/compact.yml
index 2d2eab0..8d67466 100644
--- a/salt/control/sizes/stacklight/compact.yml
+++ b/salt/control/sizes/stacklight/compact.yml
@@ -2,11 +2,11 @@
_param:
salt_control_size_cpu_stacklight_log: 4
salt_control_size_ram_stacklight_log: 8192
- salt_control_size_disk_profile_stacklight_log: xxlarge
+ salt_control_size_disk_profile_stacklight_log: xxxlarge
salt_control_size_net_profile_stacklight_log: default
salt_control_size_cpu_stacklight_server: 4
salt_control_size_ram_stacklight_server: 8192
- salt_control_size_disk_profile_stacklight_server: small
+ salt_control_size_disk_profile_stacklight_server: xxlarge
salt_control_size_net_profile_stacklight_server: default
salt_control_size_cpu_stacklight_telemetry: 4
salt_control_size_ram_stacklight_telemetry: 8192
diff --git a/salt/control/sizes/stacklight/large.yml b/salt/control/sizes/stacklight/large.yml
index 23a9df5..6e2463f 100644
--- a/salt/control/sizes/stacklight/large.yml
+++ b/salt/control/sizes/stacklight/large.yml
@@ -2,7 +2,7 @@
_param:
salt_control_size_cpu_stacklight_log: 16
salt_control_size_ram_stacklight_log: 49152
- salt_control_size_disk_profile_stacklight_log: xxhuge
+ salt_control_size_disk_profile_stacklight_log: xxxxhuge
salt_control_size_net_profile_stacklight_log: default
salt_control_size_cpu_stacklight_server: 24
salt_control_size_ram_stacklight_server: 262144
diff --git a/salt/control/sizes/stacklight/medium.yml b/salt/control/sizes/stacklight/medium.yml
new file mode 100644
index 0000000..6207f48
--- /dev/null
+++ b/salt/control/sizes/stacklight/medium.yml
@@ -0,0 +1,14 @@
+parameters:
+ _param:
+ salt_control_size_cpu_stacklight_log: 16
+ salt_control_size_ram_stacklight_log: 49152
+ salt_control_size_disk_profile_stacklight_log: xxhuge
+ salt_control_size_net_profile_stacklight_log: default
+ salt_control_size_cpu_stacklight_server: 12
+ salt_control_size_ram_stacklight_server: 65536
+ salt_control_size_disk_profile_stacklight_server: xxlarge
+ salt_control_size_net_profile_stacklight_server: default
+ salt_control_size_cpu_stacklight_telemetry: 12
+ salt_control_size_ram_stacklight_telemetry: 98304
+ salt_control_size_disk_profile_stacklight_telemetry: xhuge
+ salt_control_size_net_profile_stacklight_telemetry: default
\ No newline at end of file
diff --git a/salt/control/virt.yml b/salt/control/virt.yml
index aea524c..0bbb7fa 100644
--- a/salt/control/virt.yml
+++ b/salt/control/virt.yml
@@ -57,3 +57,9 @@
xxhuge:
- system:
size: 3000000
+ xxxhuge:
+ - system:
+ size: 4000000
+ xxxxhuge:
+ - system:
+ size: 5000000
\ No newline at end of file