Merge "Update dea file for ZTE PODs"

3 files changed, 0 insertions, 242 deletions

diff --git a/labs/zte/pod1/fuel/config/dea-pod-override.yaml b/labs/zte/pod1/fuel/config/dea-pod-override.yaml
index 46cd3e2..b1cc072 100644
--- a/labs/zte/pod1/fuel/config/dea-pod-override.yaml
+++ b/labs/zte/pod1/fuel/config/dea-pod-override.yaml
@@ -259,75 +259,3 @@ settings:
           description: ''
           label: TCP
         weight: 30
-    storage:
-      ephemeral_ceph:
-        description: Configures Nova to store ephemeral volumes in RBD. This works
-          best if Ceph is enabled for volumes and images, too. Enables live migration
-          of all types of Ceph backed VMs (without this option, live migration will
-          only work with VMs launched from Cinder volumes).
-        label: Ceph RBD for ephemeral volumes (Nova)
-        type: checkbox
-        value: true
-        weight: 75
-      images_ceph:
-        description: Configures Glance to use the Ceph RBD backend to store images.
-          If enabled, this option will prevent Swift from installing.
-        label: Ceph RBD for images (Glance)
-        label: Ceph RBD for images (Glance)
-        restrictions:
-        - settings:storage.images_vcenter.value == true: Only one Glance backend could
-            be selected.
-        type: checkbox
-        value: true
-        weight: 30
-    repo_setup:
-      metadata:
-        always_editable: true
-        group: general
-        label: Repositories
-        weight: 50
-      repos:
-        description: 'Please note: the first repository will be considered the operating
-          system mirror that will be used during node provisioning.
-
-          To create a local repository mirror on the Fuel master node, please follow
-          the instructions provided by running "fuel-createmirror --help" on the Fuel
-          master node.
-
-          Please make sure your Fuel master node has Internet access to the repository
-          before attempting to create a mirror.
-
-          '
-        extra_priority: null
-        type: custom_repo_configuration
-        value:
-        - name: ubuntu
-          priority: null
-          section: main universe multiverse
-          suite: xenial
-          type: deb
-          uri: http://10.20.6.2:8080/mirrors/ubuntu/
-        - name: ubuntu-updates
-          priority: null
-          section: main universe multiverse
-          suite: xenial-updates
-          type: deb
-          uri: http://10.20.6.2:8080/mirrors/ubuntu/
-        - name: ubuntu-security
-          priority: null
-          section: main universe multiverse
-          suite: xenial-security
-          type: deb
-          uri: http://10.20.6.2:8080/mirrors/ubuntu/
-        - name: mos
-          priority: 1050
-          section: main restricted
-          suite: mos10.0
-          type: deb
-          uri: http://10.20.6.2:8080/newton-10.0/ubuntu/x86_64
-        - name: Auxiliary
-          priority: 1150
-          section: main restricted
-          suite: auxiliary
-          type: deb
-          uri: http://10.20.6.2:8080/newton-10.0/ubuntu/auxiliary
diff --git a/labs/zte/pod2/fuel/config/dea-pod-override.yaml b/labs/zte/pod2/fuel/config/dea-pod-override.yaml
index a3592bf..394419a 100644
--- a/labs/zte/pod2/fuel/config/dea-pod-override.yaml
+++ b/labs/zte/pod2/fuel/config/dea-pod-override.yaml
@@ -259,76 +259,3 @@ settings:
           description: ''
           label: TCP
         weight: 30
-    storage:
-      ephemeral_ceph:
-        description: Configures Nova to store ephemeral volumes in RBD. This works
-          best if Ceph is enabled for volumes and images, too. Enables live migration
-          of all types of Ceph backed VMs (without this option, live migration will
-          only work with VMs launched from Cinder volumes).
-        label: Ceph RBD for ephemeral volumes (Nova)
-        type: checkbox
-        value: true
-        weight: 75
-      images_ceph:
-        description: Configures Glance to use the Ceph RBD backend to store images.
-          If enabled, this option will prevent Swift from installing.
-        label: Ceph RBD for images (Glance)
-        label: Ceph RBD for images (Glance)
-        restrictions:
-        - settings:storage.images_vcenter.value == true: Only one Glance backend could
-            be selected.
-        type: checkbox
-        value: true
-        weight: 30
-    repo_setup:
-      metadata:
-        always_editable: true
-        group: general
-        label: Repositories
-        weight: 50
-      repos:
-        description: 'Please note: the first repository will be considered the operating
-          system mirror that will be used during node provisioning.
-
-          To create a local repository mirror on the Fuel master node, please follow
-          the instructions provided by running "fuel-createmirror --help" on the Fuel
-          master node.
-
-          Please make sure your Fuel master node has Internet access to the repository
-          before attempting to create a mirror.
-
-          '
-        extra_priority: null
-        type: custom_repo_configuration
-        value:
-        - name: ubuntu
-          priority: null
-          section: main universe multiverse
-          suite: xenial
-          type: deb
-          uri: http://10.20.7.2:8080/mirrors/ubuntu/
-        - name: ubuntu-updates
-          priority: null
-          section: main universe multiverse
-          suite: xenial-updates
-          type: deb
-          uri: http://10.20.7.2:8080/mirrors/ubuntu/
-        - name: ubuntu-security
-          priority: null
-          section: main universe multiverse
-          suite: xenial-security
-          type: deb
-          uri: http://10.20.7.2:8080/mirrors/ubuntu/
-        - name: mos
-          priority: 1050
-          section: main restricted
-          suite: mos10.0
-          type: deb
-          uri: http://10.20.7.2:8080/newton-10.0/ubuntu/x86_64
-        - name: Auxiliary
-          priority: 1150
-          section: main restricted
-          suite: auxiliary
-          type: deb
-          uri: http://10.20.7.2:8080/newton-10.0/ubuntu/auxiliary
-
diff --git a/labs/zte/pod3/fuel/config/dea-pod-override.yaml b/labs/zte/pod3/fuel/config/dea-pod-override.yaml
index b93bb5f..df22225 100644
--- a/labs/zte/pod3/fuel/config/dea-pod-override.yaml
+++ b/labs/zte/pod3/fuel/config/dea-pod-override.yaml
@@ -257,100 +257,3 @@ settings:
         value:
         - 172.10.0.1
         weight: 10
-    repo_setup:
-      metadata:
-        always_editable: true
-        group: general
-        label: Repositories
-        weight: 50
-      repos:
-        description: 'Please note: the first repository will be considered the operating
-          system mirror that will be used during node provisioning.
-
-          To create a local repository mirror on the Fuel master node, please follow
-          the instructions provided by running "fuel-createmirror --help" on the Fuel
-          master node.
-
-          Please make sure your Fuel master node has Internet access to the repository
-          before attempting to create a mirror.
-
-          '
-        extra_priority: null
-        type: custom_repo_configuration
-        value:
-        - name: ubuntu
-          priority: null
-          section: main universe multiverse
-          suite: xenial
-          type: deb
-          uri: http://10.20.0.2:8080/mirrors/ubuntu/
-        - name: ubuntu-updates
-          priority: null
-          section: main universe multiverse
-          suite: xenial-updates
-          type: deb
-          uri: http://10.20.0.2:8080/mirrors/ubuntu/
-        - name: ubuntu-security
-          priority: null
-          section: main universe multiverse
-          suite: xenial-security
-          type: deb
-          uri: http://10.20.0.2:8080/mirrors/ubuntu/
-        - name: mos
-          priority: 1050
-          section: main restricted
-          suite: mos10.0
-          type: deb
-          uri: http://10.20.0.2:8080/newton-10.0/ubuntu/x86_64
-        - name: mos-updates
-          priority: 1050
-          section: main restricted
-          suite: mos10.0-updates
-          type: deb
-          uri: http://10.20.0.202/mirrors/mos-repos/ubuntu/10.0/
-        - name: mos-security
-          priority: 1050
-          section: main restricted
-          suite: mos10.0-security
-          type: deb
-          uri: http://10.20.0.202/mirrors/mos-repos/ubuntu/10.0/
-        - name: mos-holdback
-          priority: 1100
-          section: main restricted
-          suite: mos10.0-holdback
-          type: deb
-          uri: http://10.20.0.202/mirrors/mos-repos/ubuntu/10.0/
-        - name: Auxiliary
-          priority: 1150
-          section: main restricted
-          suite: auxiliary
-          type: deb
-          uri: http://10.20.0.2:8080/newton-10.0/ubuntu/auxiliary
-    storage:
-      ephemeral_ceph:
-        description: Configures Nova to store ephemeral volumes in RBD. This works
-          best if Ceph is enabled for volumes and images, too. Enables live migration
-          of all types of Ceph backed VMs (without this option, live migration will
-          only work with VMs launched from Cinder volumes).
-        label: Ceph RBD for ephemeral volumes (Nova)
-        type: checkbox
-        value: true
-        weight: 75
-      volumes_ceph:
-        description: Configures Cinder to store volumes in Ceph RBD images.
-        label: Ceph RBD for volumes (Cinder)
-        restrictions:
-        - settings:storage.volumes_lvm.value == true or settings:storage.volumes_block_device.value
-          == true
-        type: checkbox
-        value: true
-        weight: 20
-      volumes_lvm:
-        description: It is recommended to have at least one Cinder node.
-        label: Cinder LVM over iSCSI for volumes
-        restrictions:
-        - settings:storage.volumes_ceph.value == true
-        type: checkbox
-        value: false
-        weight: 10
-