diff options
| -rw-r--r-- | bootstrap-config.yaml | 3 | ||||
| -rw-r--r-- | ceph-source.yaml | 106 | ||||
| -rw-r--r-- | overcloud-without-mergepy.yaml | 1 | ||||
| -rw-r--r-- | puppet/bootstrap-config.yaml | 3 |
4 files changed, 7 insertions, 106 deletions
diff --git a/bootstrap-config.yaml b/bootstrap-config.yaml index 14ecc005..14da8265 100644 --- a/bootstrap-config.yaml +++ b/bootstrap-config.yaml @@ -4,6 +4,8 @@ description: 'Bootstrap Config' parameters: bootstrap_nodeid: type: string + bootstrap_nodeid_ip: + type: string resources: @@ -13,6 +15,7 @@ resources: config: bootstrap_host: bootstrap_nodeid: {get_param: bootstrap_nodeid} + bootstrap_nodeid_ip: {get_param: bootstrap_nodeid_ip} outputs: config_id: diff --git a/ceph-source.yaml b/ceph-source.yaml deleted file mode 100644 index 512053f4..00000000 --- a/ceph-source.yaml +++ /dev/null @@ -1,106 +0,0 @@ -heat_template_version: 2013-05-23 -description: 'Common Ceph Storage Configuration' -parameters: - CephStorageImage: - type: string - default: overcloud-ceph-storage - OvercloudCephStorageFlavor: - default: baremetal - description: Flavor for Ceph storage nodes to request when deploying. - type: string - CephClusterFSID: - default: '' - type: string - description: The Ceph cluster FSID. - CephMonKey: - default: '' - description: The Ceph monitors key. - type: string - CephAdminKey: - default: '' - description: The Ceph admin client key. - type: string -resources: - CephStorage0: - type: OS::Nova::Server - properties: - image: - {get_param: CephStorageImage} - flavor: {get_param: OvercloudCephStorageFlavor} - key_name: {get_param: KeyName} - user_data_format: SOFTWARE_CONFIG - CephStorage0AllNodesDeployment: - depends_on: [CephStorage0Deployment,controller0CephDeployment] - type: OS::Heat::StructuredDeployment - properties: - server: {get_resource: CephStorage0} - config: {get_resource: allNodesConfig} - signal_transport: {get_param: DefaultSignalTransport} - CephStorage0Deployment: - type: OS::Heat::StructuredDeployment - properties: - server: {get_resource: CephStorage0} - config: {get_resource: CephStorage0Config} - signal_transport: NO_SIGNAL - CephStorage0Config: - type: OS::Heat::StructuredConfig - properties: - group: os-apply-config - config: - ceph: - fsid: {get_param: CephClusterFSID} - keyrings: - admin: - key: {get_param: CephAdminKey} - mon_nodes: - Merge::Map: - controller0: - ip: {get_attr: [controller0, networks, ctlplane, 0]} - name: {get_attr: [controller0, name]} - controller0CephDeployment: - type: OS::Heat::StructuredDeployment - properties: - server: {get_resource: controller0} - config: {get_resource: controller0CephConfig} - signal_transport: NO_SIGNAL - controller0CephConfig: - type: OS::Heat::StructuredConfig - properties: - group: os-apply-config - config: - cinder: - include_ceph_backend: true - ceph: - fsid: {get_param: CephClusterFSID} - keyrings: - mon: - key: {get_param: CephMonKey} - admin: - key: {get_param: CephAdminKey} - mon_nodes: - Merge::Map: - controller0: - ip: {get_attr: [controller0, networks, ctlplane, 0]} - name: {get_attr: [controller0, name]} - NovaCompute0CephDeployment: - depends_on: [controller0CephDeployment] - type: OS::Heat::StructuredDeployment - properties: - server: {get_resource: NovaCompute0} - config: {get_resource: NovaCompute0CephConfig} - signal_transport: NO_SIGNAL - NovaCompute0CephConfig: - type: OS::Heat::StructuredConfig - properties: - group: os-apply-config - config: - ceph: - fsid: {get_param: CephClusterFSID} - keyrings: - admin: - key: {get_param: CephAdminKey} - mon_nodes: - Merge::Map: - controller0: - ip: {get_attr: [controller0, networks, ctlplane, 0]} - name: {get_attr: [controller0, name]} diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 22606d6e..cd684579 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -745,6 +745,7 @@ resources: type: OS::TripleO::BootstrapNode::SoftwareConfig properties: bootstrap_nodeid: {get_attr: [Controller, resource.0.hostname]} + bootstrap_nodeid_ip: {get_attr: [Controller, resource.0.ip_address]} ControllerBootstrapNodeDeployment: type: OS::Heat::StructuredDeployments diff --git a/puppet/bootstrap-config.yaml b/puppet/bootstrap-config.yaml index 29b7af7d..a8eb7585 100644 --- a/puppet/bootstrap-config.yaml +++ b/puppet/bootstrap-config.yaml @@ -4,6 +4,8 @@ description: 'Bootstrap Config Puppet' parameters: bootstrap_nodeid: type: string + bootstrap_nodeid_ip: + type: string resources: @@ -16,6 +18,7 @@ resources: bootstrap_node: mapped_data: bootstrap_nodeid: {get_param: bootstrap_nodeid} + bootstrap_nodeid_ip: {get_param: bootstrap_nodeid_ip} outputs: config_id: |