[openstack-tripleo-heat-templates] Updated patches from master-patches
slagle
slagle at fedoraproject.org
Mon Oct 20 16:11:25 UTC 2014
commit 3954baca25eaf790676c685c100b483eacb9ec97
Author: James Slagle <jslagle at redhat.com>
Date: Mon Oct 20 12:10:47 2014 -0400
Updated patches from master-patches
...and-controller-templates-without-merge.py.patch | 2 +-
...erted-version-of-block-and-object-storage.patch | 148 ++++++++++++++++++--
...P-related-parameters-to-storage-templates.patch | 133 ------------------
openstack-tripleo-heat-templates.spec | 2 -
4 files changed, 136 insertions(+), 149 deletions(-)
---
diff --git a/0001-Compute-and-controller-templates-without-merge.py.patch b/0001-Compute-and-controller-templates-without-merge.py.patch
index c29b9d2..3edfb80 100644
--- a/0001-Compute-and-controller-templates-without-merge.py.patch
+++ b/0001-Compute-and-controller-templates-without-merge.py.patch
@@ -1,4 +1,4 @@
-From da43774b30b9a06097050829a2762c9099d63311 Mon Sep 17 00:00:00 2001
+From 134eb324fd80fbb779640f6c3af298d00e1cbf8c Mon Sep 17 00:00:00 2001
From: Tomas Sedovic <tsedovic at redhat.com>
Date: Wed, 6 Aug 2014 13:24:10 +0200
Subject: [PATCH] Compute and controller templates without merge.py
diff --git a/0002-Add-converted-version-of-block-and-object-storage.patch b/0002-Add-converted-version-of-block-and-object-storage.patch
index 3a005ca..7ebc548 100644
--- a/0002-Add-converted-version-of-block-and-object-storage.patch
+++ b/0002-Add-converted-version-of-block-and-object-storage.patch
@@ -1,4 +1,4 @@
-From 9e28ff5df4195f41c8b00d3dc6c2b89a0ac62157 Mon Sep 17 00:00:00 2001
+From 7d03413cf3985d1ea3a0fa727292b7297f0535c3 Mon Sep 17 00:00:00 2001
From: Peter Belanyi <pbelanyi at redhat.com>
Date: Wed, 24 Sep 2014 07:51:13 -0400
Subject: [PATCH] Add converted version of block and object storage
@@ -17,21 +17,22 @@ OVERCLOUD_SWIFT_ID=$(load-image -d $TRIPLEO_ROOT/overcloud-swift-storage.qcow2)
Change-Id: I45f9d9f051970a83e26c0fd924d7c98276958113
---
- cinder-storage.yaml | 141 +++++++++++++++++++++++++++++++++++++++
- controller.yaml | 42 ++++++++++++
+ cinder-storage.yaml | 195 +++++++++++++++++++++++++++++++++++++++
+ compute.yaml | 2 +-
+ controller.yaml | 42 +++++++++
overcloud-resource-registry.yaml | 2 +
- overcloud-without-mergepy.yaml | 101 +++++++++++++++++++++++-----
- swift-storage.yaml | 114 +++++++++++++++++++++++++++++++
- 5 files changed, 383 insertions(+), 17 deletions(-)
+ overcloud-without-mergepy.yaml | 101 ++++++++++++++++----
+ swift-storage.yaml | 168 +++++++++++++++++++++++++++++++++
+ 6 files changed, 492 insertions(+), 18 deletions(-)
create mode 100644 cinder-storage.yaml
create mode 100644 swift-storage.yaml
diff --git a/cinder-storage.yaml b/cinder-storage.yaml
new file mode 100644
-index 0000000..549d8f2
+index 0000000..c80b777
--- /dev/null
+++ b/cinder-storage.yaml
-@@ -0,0 +1,141 @@
+@@ -0,0 +1,195 @@
+heat_template_version: 2014-10-16
+description: 'Common Block Storage Configuration'
+parameters:
@@ -57,12 +58,50 @@ index 0000000..549d8f2
+ ControllerIP:
+ default: ''
+ type: string
++ ExtraConfig:
++ default: {}
++ description: |
++ Additional configuration to inject into the cluster. The JSON should have
++ the following structure:
++ {"FILEKEY":
++ {"config":
++ [{"section": "SECTIONNAME",
++ "values":
++ [{"option": "OPTIONNAME",
++ "value": "VALUENAME"
++ }
++ ]
++ }
++ ]
++ }
++ }
++ For instance:
++ {"nova":
++ {"config":
++ [{"section": "default",
++ "values":
++ [{"option": "force_config_drive",
++ "value": "always"
++ }
++ ]
++ },
++ {"section": "cells",
++ "values":
++ [{"option": "driver",
++ "value": "nova.cells.rpc_driver.CellsRPCDriver"
++ }
++ ]
++ }
++ ]
++ }
++ }
++ type: json
+ Flavor:
+ default: baremetal
+ description: Flavor for block storage nodes to request when deploying.
+ type: string
+ GlancePort:
-+ default: 9292
++ default: "9292"
+ description: Glance port.
+ type: string
+ KeyName:
@@ -70,7 +109,7 @@ index 0000000..549d8f2
+ description: Name of an existing EC2 KeyPair to enable SSH access to the instances
+ type: string
+ NeutronEnableTunnelling:
-+ default: true
++ default: "True"
+ type: string
+ NeutronNetworkType:
+ default: gre
@@ -79,7 +118,7 @@ index 0000000..549d8f2
+ default: ''
+ type: string
+ NeutronPublicInterface:
-+ default: ''
++ default: eth0
+ type: string
+ RabbitPassword:
+ default: ''
@@ -87,6 +126,16 @@ index 0000000..549d8f2
+ RabbitUserName:
+ default: ''
+ type: string
++ SnmpdReadonlyUserName:
++ default: ro_snmp_user
++ description: The user name for SNMPd with readonly rights running on all Overcloud nodes
++ type: string
++ SnmpdReadonlyUserPassword:
++ default: unset
++ description: The user password for SNMPd with readonly rights running on all Overcloud nodes
++ type: string
++ hidden: true
++
+resources:
+ BlockStorage:
+ type: OS::Nova::Server
@@ -107,6 +156,8 @@ index 0000000..549d8f2
+ controller_host: {get_param: ControllerIP}
+ cinder_dsn: {list_join: ['', ['mysql://cinder:unset@', {get_param: ControllerIP} , '/cinder']]}
+ neutron_local_ip: {get_attr: [BlockStorage , networks, ctlplane, 0]}
++ snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
++ snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
+ signal_transport: NO_SIGNAL
+ BlockStorageConfig:
+ type: OS::Heat::StructuredConfig
@@ -124,6 +175,10 @@ index 0000000..549d8f2
+ get_param: CinderPassword
+ iscsi-helper:
+ get_param: CinderISCSIHelper
++ snmpd:
++ export_MIB: UCD-SNMP-MIB
++ readonly_user_name: {get_input: snmpd_readonly_user_name}
++ readonly_user_password: {get_input: snmpd_readonly_user_password}
+ rabbit:
+ host: {get_input: controller_host}
+ username: {get_param: RabbitUserName}
@@ -173,6 +228,19 @@ index 0000000..549d8f2
+ params:
+ IP: {get_attr: [BlockStorage, networks, ctlplane, 0]}
+ HOST: {get_attr: [BlockStorage, name]}
+diff --git a/compute.yaml b/compute.yaml
+index 350b5ec..08e8153 100644
+--- a/compute.yaml
++++ b/compute.yaml
+@@ -163,7 +163,7 @@ parameters:
+ description: An OVS bridge to create for accessing external networks.
+ type: string
+ NeutronPublicInterface:
+- default: ''
++ default: eth0
+ description: A port to add to the NeutronPhysicalBridge.
+ type: string
+ NeutronTunnelTypes:
diff --git a/controller.yaml b/controller.yaml
index 885d089..459b7f7 100644
--- a/controller.yaml
@@ -399,16 +467,54 @@ index cb4f25c..94770a8 100644
type: OS::Heat::StructuredConfig
diff --git a/swift-storage.yaml b/swift-storage.yaml
new file mode 100644
-index 0000000..c10ac63
+index 0000000..86731fd
--- /dev/null
+++ b/swift-storage.yaml
-@@ -0,0 +1,114 @@
+@@ -0,0 +1,168 @@
+heat_template_version: 2014-10-16
+description: 'Common Swift Storage Configuration'
+parameters:
+ ControllerIP:
+ default: ''
+ type: string
++ ExtraConfig:
++ default: {}
++ description: |
++ Additional configuration to inject into the cluster. The JSON should have
++ the following structure:
++ {"FILEKEY":
++ {"config":
++ [{"section": "SECTIONNAME",
++ "values":
++ [{"option": "OPTIONNAME",
++ "value": "VALUENAME"
++ }
++ ]
++ }
++ ]
++ }
++ }
++ For instance:
++ {"nova":
++ {"config":
++ [{"section": "default",
++ "values":
++ [{"option": "force_config_drive",
++ "value": "always"
++ }
++ ]
++ },
++ {"section": "cells",
++ "values":
++ [{"option": "driver",
++ "value": "nova.cells.rpc_driver.CellsRPCDriver"
++ }
++ ]
++ }
++ ]
++ }
++ }
++ type: json
+ Flavor:
+ default: baremetal
+ description: Flavor for Swift storage nodes to request when deploying.
@@ -446,12 +552,26 @@ index 0000000..c10ac63
+ type: number
+ default: 1
+ description: How many replicas to use in the swift rings.
++ SnmpdReadonlyUserName:
++ default: ro_snmp_user
++ description: The user name for SNMPd with readonly rights running on all Overcloud nodes
++ type: string
++ SnmpdReadonlyUserPassword:
++ default: unset
++ description: The user password for SNMPd with readonly rights running on all Overcloud nodes
++ type: string
++ hidden: true
++
+resources:
+ SwiftConfig:
+ type: OS::Heat::StructuredConfig
+ properties:
+ group: os-apply-config
+ config:
++ snmpd:
++ export_MIB: UCD-SNMP-MIB
++ readonly_user_name: {get_input: snmpd_readonly_user_name}
++ readonly_user_password: {get_input: snmpd_readonly_user_password}
+ swift:
+ hash: { get_input: swift_hash_suffix }
+ part-power: { get_input: swift_part_power }
@@ -493,6 +613,8 @@ index 0000000..c10ac63
+ signal_transport: NO_SIGNAL
+ input_values:
+ neutron_local_ip: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
++ snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
++ snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
+ swift_hash_suffix: {get_param: HashSuffix}
+ swift_password: {get_param: Password}
+ swift_part_power: {get_param: PartPower}
diff --git a/openstack-tripleo-heat-templates.spec b/openstack-tripleo-heat-templates.spec
index 0e36fae..c772616 100644
--- a/openstack-tripleo-heat-templates.spec
+++ b/openstack-tripleo-heat-templates.spec
@@ -9,7 +9,6 @@ Source0: http://tarballs.openstack.org/tripleo-heat-templates/tripleo-heat-templ
Patch0001: 0001-Compute-and-controller-templates-without-merge.py.patch
Patch0002: 0002-Add-converted-version-of-block-and-object-storage.patch
-Patch0003: 0003-Adding-SNMP-related-parameters-to-storage-templates.patch
BuildArch: noarch
BuildRequires: python2-devel
@@ -28,7 +27,6 @@ building Heat Templates to do deployments of OpenStack.
%patch0001 -p1
%patch0002 -p1
-%patch0003 -p1
%build
%{__python2} setup.py build
More information about the scm-commits
mailing list