Upgrade intel pod 15 to Airship 1.8

Depends: https://gerrit.opnfv.org/gerrit/c/airship/+/70158
Change-Id: Ic9b8a56de430d02f2f21e053a40c9c29ab40433f
Signed-off-by: James Gu <james.gu@att.com>

4 files changed, 7 insertions, 180 deletions

diff --git a/site/intel-pod15/software/charts/ucp/ceph/ceph-client-update.yaml b/site/intel-pod15/software/charts/ucp/ceph/ceph-client-update.yaml
deleted file mode 100644
index eb921b8..0000000
--- a/site/intel-pod15/software/charts/ucp/ceph/ceph-client-update.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-# The purpose of this file is to define environment-specific parameters for ceph
-# client update
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: ucp-ceph-client-update
-  layeringDefinition:
-    abstract: false
-    layer: site
-    parentSelector:
-      name: ucp-ceph-client-update-global
-    actions:
-      - method: merge
-        path: .
-  storagePolicy: cleartext
-data:
-  values:
-    conf:
-      pool:
-        target:
-          # NEWSITE-CHANGEME: Total number of OSDs. Does not need to change if
-          # your HW matches this site's HW. Verify for your environment.
-          # 8 OSDs per node x 3 nodes = 24
-          osd: 3
-...
diff --git a/site/intel-pod15/software/charts/ucp/ceph/ceph-client.yaml b/site/intel-pod15/software/charts/ucp/ceph/ceph-client.yaml
deleted file mode 100644
index e1e8ecf..0000000
--- a/site/intel-pod15/software/charts/ucp/ceph/ceph-client.yaml
+++ /dev/null
@@ -1,100 +0,0 @@
----
-# The purpose of this file is to define envrionment-specific parameters for the
-# ceph client
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: ucp-ceph-client
-  layeringDefinition:
-    abstract: false
-    layer: site
-    parentSelector:
-      name: ucp-ceph-client-global
-    actions:
-      - method: merge
-        path: .
-  storagePolicy: cleartext
-data:
-  values:
-    conf:
-      pool:
-        target:
-          # NEWSITE-CHANGEME: The number of OSDs per ceph node. Does not need to
-          # change if your deployment HW matches this site's HW.
-          osd: 1
-        spec:
-          # RBD pool
-          - name: rbd
-            application: rbd
-            replication: 1
-            percent_total_data: 40
-          - name: cephfs_metadata
-            application: cephfs
-            replication: 1
-            percent_total_data: 5
-          - name: cephfs_data
-            application: cephfs
-            replication: 1
-            percent_total_data: 10
-          # RadosGW pools
-          - name: .rgw.root
-            application: rgw
-            replication: 1
-            percent_total_data: 0.1
-          - name: default.rgw.control
-            application: rgw
-            replication: 1
-            percent_total_data: 0.1
-          - name: default.rgw.data.root
-            application: rgw
-            replication: 1
-            percent_total_data: 0.1
-          - name: default.rgw.gc
-            application: rgw
-            replication: 1
-            percent_total_data: 0.1
-          - name: default.rgw.log
-            application: rgw
-            replication: 1
-            percent_total_data: 0.1
-          - name: default.rgw.intent-log
-            application: rgw
-            replication: 1
-            percent_total_data: 0.1
-          - name: default.rgw.meta
-            application: rgw
-            replication: 1
-            percent_total_data: 0.1
-          - name: default.rgw.usage
-            application: rgw
-            replication: 1
-            percent_total_data: 0.1
-          - name: default.rgw.users.keys
-            application: rgw
-            replication: 1
-            percent_total_data: 0.1
-          - name: default.rgw.users.email
-            application: rgw
-            replication: 1
-            percent_total_data: 0.1
-          - name: default.rgw.users.swift
-            application: rgw
-            replication: 1
-            percent_total_data: 0.1
-          - name: default.rgw.users.uid
-            application: rgw
-            replication: 1
-            percent_total_data: 0.1
-          - name: default.rgw.buckets.extra
-            application: rgw
-            replication: 1
-            percent_total_data: 0.1
-          - name: default.rgw.buckets.index
-            application: rgw
-            replication: 1
-            percent_total_data: 3
-          - name: default.rgw.buckets.data
-            application: rgw
-            replication: 1
-            percent_total_data: 34.8
-...
diff --git a/site/intel-pod15/software/charts/ucp/ceph/ceph-osd.yaml b/site/intel-pod15/software/charts/ucp/ceph/ceph-osd.yaml
deleted file mode 100644
index 25297d9..0000000
--- a/site/intel-pod15/software/charts/ucp/ceph/ceph-osd.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# The purpose of this file is to define environment-specific parameters for
-# ceph-osd
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: ucp-ceph-osd
-  layeringDefinition:
-    abstract: false
-    layer: site
-    parentSelector:
-      name: ucp-ceph-osd-global
-    actions:
-      - method: replace
-        path: .values.conf.storage.osd
-      - method: merge
-        path: .
-  storagePolicy: cleartext
-data:
-  values:
-    conf:
-      storage:
-        osd:
-          - data:
-              type: directory
-              location: /var/lib/ceph/osd/osd-one
-            journal:
-              type: directory
-              location: /var/lib/ceph/journal/osd-one
-...
diff --git a/site/intel-pod15/software/charts/ucp/divingbell/divingbell.yaml b/site/intel-pod15/software/charts/ucp/divingbell/divingbell.yaml
index 7e5adb0..bfab525 100644
--- a/site/intel-pod15/software/charts/ucp/divingbell/divingbell.yaml
+++ b/site/intel-pod15/software/charts/ucp/divingbell/divingbell.yaml
@@ -8,6 +8,7 @@
 schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
+  replacement: true
   name: ucp-divingbell
   layeringDefinition:
     abstract: false
@@ -25,31 +26,19 @@ metadata:
         path: .values.conf.uamlite.users[0].user_sshkeys[0]
       src:
         schema: deckhand/PublicKey/v1
-        name: opnfv_ssh_public_key
+        name: jenkins_ssh_public_key
         path: .
     - dest:
         path: .values.conf.uamlite.users[1].user_sshkeys[0]
       src:
         schema: deckhand/PublicKey/v1
-        name: sridhar_ssh_public_key
-        path: .
-    - dest:
-        path: .values.conf.uamlite.users[1].user_crypt_passwd
-      src:
-        schema: deckhand/Passphrase/v1
-        name: sridhar_crypt_password
+        name: jamesg_ssh_public_key
         path: .
     - dest:
         path: .values.conf.uamlite.users[2].user_sshkeys[0]
       src:
         schema: deckhand/PublicKey/v1
-        name: mfix_ssh_public_key
-        path: .
-    - dest:
-        path: .values.conf.uamlite.users[2].user_crypt_passwd
-      src:
-        schema: deckhand/Passphrase/v1
-        name: mfix_crypt_password
+        name: sridhar_ssh_public_key
         path: .
     - dest:
         path: .values.conf.uamlite.users[3].user_sshkeys[0]
@@ -57,24 +46,18 @@ metadata:
         schema: deckhand/PublicKey/v1
         name: cedric_ssh_public_key
         path: .
-    - dest:
-        path: .values.conf.uamlite.users[3].user_crypt_passwd
-      src:
-        schema: deckhand/Passphrase/v1
-        name: cedric_crypt_password
-        path: .
 data:
   values:
     conf:
       uamlite:
         users:
-          - user_name: opnfv
+          - user_name: jenkins
             user_sudo: true
             user_sshkeys: []
-          - user_name: sridhar
+          - user_name: jamesg
             user_sudo: true
             user_sshkeys: []
-          - user_name: mfix
+          - user_name: sridhar
             user_sudo: true
             user_sshkeys: []
           - user_name: cedric