Merge pull request #3452 from cjloader/newton-ceph-fix

Remove bad Ceph repos and add new Grafana repo
rcbops · Jan 18, 2019 · 72c4094 · 72c4094
2 parents b55806f + eab06c6
commit 72c4094
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 238 deletions.
diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml
@@ -1,15 +1,3 @@
-- name: ceph.ceph-common
-  scm: git
-  src: https://github.com/ceph/ansible-ceph-common.git
-  version: 1c623611a1d43b4c9116d1a0c21f0bdbdd87a0e7
-- name: ceph.ceph-mon
-  scm: git
-  src: https://github.com/ceph/ansible-ceph-mon.git
-  version: 01d3d6f0b06125b33b1e25745c06fa1d7137f7e9
-- name: ceph.ceph-osd
-  scm: git
-  src: https://github.com/ceph/ansible-ceph-osd.git
-  version: 434a13f4d3ee3f60c410052d2670d5dfea034bf8
 # Note (Frank) - RLM-322:
 # this is a forked ansible role for removing
 # hardcoded period mark from hostname template.

diff --git a/gating/generate_release_notes/run b/gating/generate_release_notes/run
@@ -10,7 +10,7 @@ export REPO_URL=${RE_HOOK_REPO_HTTP_URL}
 
 apt-get install -y pandoc
 
-pip install osa_differ==0.3.10 rpc_differ==0.3.10 reno==2.5.1
+pip install osa_differ==0.3.10 rpc_differ==0.3.11 reno==2.5.1
 
 gating/generate_release_notes/generate_release_notes.sh
 

diff --git a/group_vars/all/ceph.yml b/group_vars/all/ceph.yml
diff --git a/releasenotes/notes/remove-upstream-ceph-in-favor-of-rpc-ceph-4df68d5d97ec1835.yaml b/releasenotes/notes/remove-upstream-ceph-in-favor-of-rpc-ceph-4df68d5d97ec1835.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Because RPC-O utilizes RPC-Ceph, we are removing the native ceph-ansible
+    related roles. Ceph has removed the repos that we clone down.
diff --git a/rpcd/playbooks/ceph-all.yml b/rpcd/playbooks/ceph-all.yml
diff --git a/rpcd/playbooks/ceph-mon.yml b/rpcd/playbooks/ceph-mon.yml
diff --git a/rpcd/playbooks/ceph-osd.yml b/rpcd/playbooks/ceph-osd.yml
diff --git a/scripts/artifacts-building/apt/aptly-vars.yml b/scripts/artifacts-building/apt/aptly-vars.yml
@@ -29,9 +29,9 @@ rpc_series: "{{ rpc_release.split('.')[0] }}"
 
 # Prepare for aptly, repos to clone.
 aptly_clone_this_first:
-  - repo: "https://github.com/evrardjp/ansible-role-aptly.git"
+  - repo: "https://github.com/rcbops/ansible-role-aptly.git"
     dest: "{{ ansible_roles_folder }}/infOpen.aptly"
-    version: "rax"
+    version: "master"
 
 aptly_custom_gpg_key_file: "{{ artifacts_root_folder }}/aptly.private.key"
 aptly_custom_gpg_pubkey_file: "{{ artifacts_root_folder }}/aptly.public.key"
@@ -69,7 +69,7 @@ aptly_miko_mapping:
       - "slushie-{{ rpc_release }}-elastic-es-1.7-ALL"
       - "slushie-{{ rpc_release }}-elastic-es-2.x-ALL"
       - "slushie-{{ rpc_release }}-influxdata-trusty"
-      - "slushie-{{ rpc_release }}-grafana-jessie-ALL"
+      - "slushie-{{ rpc_release }}-grafana-stable-ALL"
     xenial:
       - "slushie-{{ rpc_release }}-ubuntu-updates-xenial"
       - "slushie-{{ rpc_release }}-uca-newton-updates-xenial"
@@ -83,7 +83,7 @@ aptly_miko_mapping:
       - "slushie-{{ rpc_release }}-elastic-es-1.7-ALL"
       - "slushie-{{ rpc_release }}-elastic-es-2.x-ALL"
       - "slushie-{{ rpc_release }}-influxdata-xenial"
-      - "slushie-{{ rpc_release }}-grafana-jessie-ALL"
+      - "slushie-{{ rpc_release }}-grafana-stable-ALL"
 
 # mapping for N (NOT MERGE) snapshots
 # This is a list of the repo/mirror snapshots (slushies) that will be published separately.
@@ -499,6 +499,24 @@ aptly_mirrors:
       - "-keyring='trustedkeys.gpg'"
     update_flags:
       - "-keyring='trustedkeys.gpg'"
+    do_update: no
+
+  - name: grafana-stable-ALL
+    archive_url: https://packages.grafana.com/oss/deb
+    distribution: stable
+    component1:
+      - main
+    state: "present"
+    gpg:
+      key: "8c8c34c524098cb6"
+      server: "hkp://keyserver.ubuntu.com:80"
+      keyring: "trustedkeys.gpg"
+    create_flags:
+      - "-keyring='trustedkeys.gpg'"
+      - "-architectures=amd64"
+    update_flags:
+      - "-keyring='trustedkeys.gpg'"
+      - "-architectures=amd64"
     do_update: "{{ aptly_mirror_do_updates }}"
 
 ## TODO