diff options
| author |   David Blaisonneau <david.blaisonneau@orange.com> | 2016-08-23 12:30:36 +0200 |
|---|---|---|
| committer |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-08-24 08:57:48 +0000 |
| commit | 70d58a8a2c1684bd4818be0a435187e3c75041d3 (patch) | |
| tree | 8779f3d785adc5925e3e2a4ac79b20aa8321eb60 /jjb/opnfv | |
| parent | 4d3f095af098a05f7cac98ac3ab456fe1b2c8cf1 (diff) | |
[JOID] Joid cleanup
Change-Id: I133b1dae993fa6b5e0fc52be411f68a06fbe72bb
Signed-off-by: David Blaisonneau <david.blaisonneau@orange.com>
Diffstat (limited to 'jjb/opnfv')
| -rw-r--r-- | jjb/opnfv/installer-params.yml | 12 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 24 |
2 files changed, 0 insertions, 36 deletions
diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml index 833a1d449..d1225dcab 100644 --- a/jjb/opnfv/installer-params.yml +++ b/jjb/opnfv/installer-params.yml @@ -70,22 +70,10 @@ default: 'mitaka' description: 'OpenStack release (liberty|mitaka)' - string: - name: EXTERNAL_NETWORK - default: ext-net;flat;192.168.0.2;192.168.0.253;192.168.0.1;192.168.0.0/24 - description: "External network to create (name;type;first ip;last ip; gateway;network)" - - string: - name: CEPH_DISKS - default: '/srv' - description: "Disks to use by ceph by default (space separated list)" - - string: name: LAB_CONFIG default: "$HOME/joid_config" description: "Local lab config and Openstack openrc location" - string: - name: CEPH_REFORMAT - default: 'false' - description: "Format or not disk before using ceph [true/false] (must be done the first time)" - - string: name: MAAS_REINSTALL default: 'false' description: "Reinstall MAAS and Bootstrap before deploy [true/false]" diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index dd94679a3..019148a96 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -160,14 +160,6 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - string: - name: CEPH_DISKS - default: /srv - description: "Disks to use by ceph (comma separated list)" - - string: - name: EXTERNAL_NETWORK - default: ext-net;flat;10.5.15.5;10.5.15.250;10.5.15.254;10.5.15.0/24 - description: "External network to create for pod5 (name;type;first ip;last ip; gateway;network)" ##################################################### # Parameters for CI virtual PODs ##################################################### @@ -480,14 +472,6 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - string: - name: CEPH_DISKS - default: /dev/sdb /dev/sdc - description: "Disks to use by ceph by default (space separated list)" - - string: - name: EXTERNAL_NETWORK - default: ext-net;flat;161.105.231.2;161.105.231.62;161.105.231.1;161.105.231.0/26 - description: "External network to create (name;type;first ip;last ip; gateway;network)" - parameter: name: 'orange-pod2-defaults' parameters: @@ -502,14 +486,6 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - string: - name: CEPH_DISKS - default: /dev/sdb /dev/sdc - description: "Disks to use by ceph by default (space separated list)" - - string: - name: EXTERNAL_NETWORK - default: ext-net;flat;161.105.231.2;161.105.231.62;161.105.231.1;161.105.231.0/26 - description: "External network to create (name;type;first ip;last ip; gateway;network)" - parameter: name: 'orange-pod5-defaults' parameters: |