From f96dbd061045c0485725d77d5ec1351ac8445f1a Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Tue, 22 May 2018 11:56:25 +0200 Subject: [PATCH] Remove CephAnsiblePlaybook parameter reset from ceph-ansible env files With the changes in environments/lifecycle to set/reset the default CephAnsiblePlaybook value, we do not need to have it in the ceph-ansible environment files anymore. Closes-Bug: 1772650 Change-Id: I3004feda52cd03f982c359a027e68514c25ca893 --- environments/ceph-ansible/ceph-ansible-external.yaml | 1 - environments/ceph-ansible/ceph-ansible.yaml | 1 - environments/storage-environment.yaml | 2 -- 3 files changed, 4 deletions(-) diff --git a/environments/ceph-ansible/ceph-ansible-external.yaml b/environments/ceph-ansible/ceph-ansible-external.yaml index a959c79051..10326a5de7 100644 --- a/environments/ceph-ansible/ceph-ansible-external.yaml +++ b/environments/ceph-ansible/ceph-ansible-external.yaml @@ -2,7 +2,6 @@ resource_registry: OS::TripleO::Services::CephExternal: ../../docker/services/ceph-ansible/ceph-external.yaml parameter_defaults: - CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample'] # NOTE: These example parameters are required when using CephExternal #CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19' #CephClientKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ==' diff --git a/environments/ceph-ansible/ceph-ansible.yaml b/environments/ceph-ansible/ceph-ansible.yaml index a862b96120..950f95813e 100644 --- a/environments/ceph-ansible/ceph-ansible.yaml +++ b/environments/ceph-ansible/ceph-ansible.yaml @@ -5,7 +5,6 @@ resource_registry: OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml parameter_defaults: - CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample'] CinderEnableIscsiBackend: false CinderEnableRbdBackend: true CinderBackupBackend: ceph diff --git a/environments/storage-environment.yaml b/environments/storage-environment.yaml index da64c0dc95..4aa457f2bb 100644 --- a/environments/storage-environment.yaml +++ b/environments/storage-environment.yaml @@ -12,8 +12,6 @@ resource_registry: OS::TripleO::Services::CephClient: ../docker/services/ceph-ansible/ceph-client.yaml parameter_defaults: - CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample'] - #### BACKEND SELECTION #### ## Whether to enable iscsi backend for Cinder.