From 6674c39d80b2418aa573d7f8bbbb9c92648f90c5 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Fri, 21 Nov 2014 06:11:26 -0500 Subject: Bring back (abandoned) support for Cinder/NFS We used to have a YAML file providing a test setup for Cinder/NFS which could be used via a special Makefile target; this was not used in CI anymore though and overtime things broke. This change aims at bringing that functionality back and also make it easier to use it via a number of changes: * delete unmaintained nfs-server-source (not working due to changes in the elements) * delete (unneeded) block-storage-nfs * remove the hidden block-storage-with-nfs target from Makefile * add a some nfs-source which supports newer elements and newer template language as well * improve existing comments in Makefile documeting how to use it Change-Id: I96144ee2f4ca33bd7467f09ad960ea268c1250bf --- block-storage-nfs.yaml | 69 -------------------------------------------------- 1 file changed, 69 deletions(-) delete mode 100644 block-storage-nfs.yaml (limited to 'block-storage-nfs.yaml') diff --git a/block-storage-nfs.yaml b/block-storage-nfs.yaml deleted file mode 100644 index b87ef4e5..00000000 --- a/block-storage-nfs.yaml +++ /dev/null @@ -1,69 +0,0 @@ -heat_template_version: 2013-05-23 -description: 'Common Block Storage Configuration' -parameters: - BlockStorageImage: - type: string - default: overcloud-cinder-volume - OvercloudBlockStorageFlavor: - description: Flavor for block storage nodes to request when deploying. - type: string - constraints: - - custom_constraint: nova.flavor -resources: - BlockStorageAccessPolicy: - type: OS::Heat::AccessPolicy - properties: - AllowedResources: - - BlockStorage0 - BlockStorageUser: - type: AWS::IAM::User - properties: - Policies: [ { get_resource: BlockStorageAccessPolicy } ] - BlockStorageKey: - type: AWS::IAM::AccessKey - properties: - UserName: - get_resource: BlockStorageUser - BlockStorage0CompletionCondition: - type: AWS::CloudFormation::WaitCondition - depends_on: controller0Config - properties: - Handle: {get_resource: BlockStorage0CompletionHandle} - Count: '1' - Timeout: '1800' - BlockStorage0CompletionHandle: - type: AWS::CloudFormation::WaitConditionHandle - BlockStorage0: - type: OS::Nova::Server - properties: - image: - {get_param: BlockStorageImage} - flavor: {get_param: OvercloudBlockStorageFlavor} - key_name: {get_param: KeyName} - metadata: - completion-handle: - get_resource: BlockStorage0CompletionHandle - os-collect-config: - cfn: - access_key_id: - get_resource: BlockStorageKey - secret_access_key: - get_attr: [ BlockStorageKey, SecretAccessKey ] - stack_name: {get_param: 'AWS::StackName'} - keystone: - host: {get_attr: [controller0, networks, ctlplane, 0]} - cinder: - db: {"Fn::Join": ['', ['mysql://cinder:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} , '/cinder']]} - volume_size_mb: '5000' - service-password: - get_param: CinderPassword - include_nfs_backend: 'true' - nfs_shares: - - {"Fn::Join": ['', [{get_attr: [controller0, networks, ctlplane, 0]} , ':/mnt/state/var/lib/nfs_share']]} - admin-password: {get_param: AdminPassword} - rabbit: - host: {get_attr: [controller0, networks, ctlplane, 0]} - username: {get_param: RabbitUserName} - password: {get_param: RabbitPassword} - interfaces: - control: {get_param: NeutronPublicInterface} -- cgit 1.2.3-korg