[openstack-tripleo-heat-templates/f21] Revert "Updated patches from master-patches"
slagle
slagle at fedoraproject.org
Fri Oct 3 12:03:22 UTC 2014
commit 55a94c0a4d9f62853b85b3b301f550e70bec5961
Author: James Slagle <jslagle at redhat.com>
Date: Fri Oct 3 08:00:55 2014 -0400
Revert "Updated patches from master-patches"
This reverts commit cda82eace17ce17410c33293f6b8d51f261fdc70.
0001-Add-BlockStorage0Config-Resource.patch | 103 ++++++++++
...nable_tunneling-to-swift-storage-metadata.patch | 38 ++++
0003-Expose-dnsmasq-options.patch | 57 ++++++
0004-Use-127.0.0.1-in-mysql-connection-url.patch | 207 ++++++++++++++++++++
4 files changed, 405 insertions(+), 0 deletions(-)
---
diff --git a/0001-Add-BlockStorage0Config-Resource.patch b/0001-Add-BlockStorage0Config-Resource.patch
new file mode 100644
index 0000000..b601ba2
--- /dev/null
+++ b/0001-Add-BlockStorage0Config-Resource.patch
@@ -0,0 +1,103 @@
+From f7c4f3089b0aa1fc29dd7eeae517d4b3e520b140 Mon Sep 17 00:00:00 2001
+From: James Slagle <jslagle at redhat.com>
+Date: Thu, 27 Mar 2014 11:00:28 -0400
+Subject: [PATCH] Add BlockStorage0Config Resource
+
+Add a BlockStorage0Config resource in the block-storage.yaml template.
+This was missing previously and was causing the behavior of having all
+block storage nodes only being created after all other nodes were up in
+a deployment (I presume b/c of the wait conditions).
+
+Also, we need the BlockStorage0Config resource so that we can get the
+configuration of neutron-openvswitch-agent from the metadata, previously
+the values in the file were unset, causing the service to fail to start.
+
+Change-Id: I297de24079d1ece66d35213b4ef1f2c8c50e73f0
+---
+ block-storage.yaml | 45 +++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 41 insertions(+), 4 deletions(-)
+
+diff --git a/block-storage.yaml b/block-storage.yaml
+index 453a0ac..e651b4f 100644
+--- a/block-storage.yaml
++++ b/block-storage.yaml
+@@ -8,17 +8,24 @@ Parameters:
+ Default: baremetal
+ Description: Flavor for block storage nodes to request when deploying.
+ Type: String
++ NeutronNetworkType:
++ Type: String
++ Default: 'gre'
++ NeutronEnableTunnelling:
++ Type: String
++ Default: True
+ Resources:
+ BlockStorageAccessPolicy:
+ Type: OS::Heat::AccessPolicy
+ Properties:
+ AllowedResources:
+ - BlockStorage0
++ - BlockStorage0Config
+ BlockStorageUser:
+ Type: AWS::IAM::User
+ Properties:
+ Policies: [ { Ref: BlockStorageAccessPolicy } ]
+- BlockStorageKey:
++ BlockStorage0Key:
+ Type: AWS::IAM::AccessKey
+ Properties:
+ UserName:
+@@ -40,16 +47,32 @@ Resources:
+ flavor: {Ref: OvercloudBlockStorageFlavor}
+ key_name: {Ref: KeyName}
+ Metadata:
++ os-collect-config:
++ cfn:
++ access_key_id:
++ Ref: BlockStorage0Key
++ secret_access_key:
++ Fn::GetAtt: [ BlockStorage0Key, SecretAccessKey ]
++ stack_name: {Ref: 'AWS::StackName'}
++ path: BlockStorage0Config.Metadata
++ OpenStack::ImageBuilder::Elements: [ cinder ]
++ BlockStorage0Config:
++ Type: AWS::AutoScaling::LaunchConfiguration
++ Properties:
++ InstanceType: '0'
++ ImageId: '0'
++ Metadata:
+ completion-handle:
+ Ref: BlockStorage0CompletionHandle
+ os-collect-config:
+ cfn:
+ access_key_id:
+- Ref: BlockStorageKey
++ Ref: BlockStorage0Key
+ secret_access_key:
+- Fn::GetAtt: [ BlockStorageKey, SecretAccessKey ]
++ Fn::GetAtt: [ BlockStorage0Key, SecretAccessKey ]
+ stack_name: {Ref: 'AWS::StackName'}
+- OpenStack::ImageBuilder::Elements: [ cinder ]
++ path: BlockStorage0Config.Metadata
++ admin-password: {Ref: AdminPassword}
+ keystone:
+ host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
+ cinder:
+@@ -64,3 +87,17 @@ Resources:
+ password: {Ref: RabbitPassword}
+ interfaces:
+ control: {Ref: NeutronPublicInterface}
++ neutron:
++ ovs:
++ local_ip:
++ Fn::Select:
++ - 0
++ - Fn::Select:
++ - ctlplane
++ - Fn::GetAtt:
++ - BlockStorage0
++ - networks
++ tenant_network_type: {Ref: NeutronNetworkType}
++ enable_tunneling: {Ref: NeutronEnableTunnelling}
++ service-password:
++ Ref: NeutronPassword
diff --git a/0002-Add-enable_tunneling-to-swift-storage-metadata.patch b/0002-Add-enable_tunneling-to-swift-storage-metadata.patch
new file mode 100644
index 0000000..eae3131
--- /dev/null
+++ b/0002-Add-enable_tunneling-to-swift-storage-metadata.patch
@@ -0,0 +1,38 @@
+From 3acff480cc86fbe7543c968ae3f76349e02081b1 Mon Sep 17 00:00:00 2001
+From: James Slagle <jslagle at redhat.com>
+Date: Thu, 27 Mar 2014 11:02:41 -0400
+Subject: [PATCH] Add enable_tunneling to swift storage metadata
+
+Add the enable_tunneling option to the neutron-openvswitch-agent
+metadata for the swift storage template. If not preset, this option is
+left blank in the openvswitch plugin configuration plugin. This causes
+the service to fail to start because a blank value is not permissible
+for a boolean option.
+
+Change-Id: Ieadcdab295913121bd00dbd25e4245024bc2240f
+---
+ swift-storage-source.yaml | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml
+index 92e11e6..16f2f36 100644
+--- a/swift-storage-source.yaml
++++ b/swift-storage-source.yaml
+@@ -11,6 +11,9 @@ Parameters:
+ NeutronNetworkType:
+ Type: String
+ Default: 'gre'
++ NeutronEnableTunnelling:
++ Type: String
++ Default: True
+ Resources:
+ SwiftStorageAccessPolicy:
+ Type: OS::Heat::AccessPolicy
+@@ -81,6 +84,7 @@ Resources:
+ - SwiftStorage0
+ - networks
+ tenant_network_type: {Ref: NeutronNetworkType}
++ enable_tunneling: {Ref: NeutronEnableTunnelling}
+ service-password:
+ Ref: NeutronPassword
+ swift:
diff --git a/0003-Expose-dnsmasq-options.patch b/0003-Expose-dnsmasq-options.patch
new file mode 100644
index 0000000..36a599a
--- /dev/null
+++ b/0003-Expose-dnsmasq-options.patch
@@ -0,0 +1,57 @@
+From 5b74da3b3b03afd537c00dd0dc8f143a36cb532c Mon Sep 17 00:00:00 2001
+From: James Slagle <jslagle at redhat.com>
+Date: Tue, 25 Mar 2014 08:34:29 -0400
+Subject: [PATCH] Expose dnsmasq options
+
+Adds a new parameter, NeutronDnsmasqOptions, to the overcloud template.
+
+Allows the ability to set dnsmasq options for neutron dhcp agent. This
+will allow us to configure mtu to be 1400 for tenant instances on the
+overcloud. This should help with poor network performance and vm's that
+are just plain unreachable via ssh due to the GRE tunnel overhead.
+
+The default here has been set to:
+dhcp-option-force=26,1400
+
+This is the recommended way to configure OpenStack with the Open vSwitch
+plugin per:
+http://docs.openstack.org/admin-guide-cloud/content/openvswitch_plugin.html
+
+All the documentation I can find on the web (openstack-dev,
+ask.openstack.org, etc), recommend applying this setting. Others have
+reported slow vm performance as well, and this resolves that issue
+(apparently anyway...we'd need to test).
+
+Change-Id: If24326045987b5a484ba2f71f591092987966536
+Partial-Bug: #1270646
+
+Conflicts:
+ overcloud-source.yaml
+---
+ overcloud-source.yaml | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/overcloud-source.yaml b/overcloud-source.yaml
+index bba161e..37acb84 100644
+--- a/overcloud-source.yaml
++++ b/overcloud-source.yaml
+@@ -121,6 +121,10 @@ Parameters:
+ Default: ''
+ Description: If set, the public interface is a vlan with this device as the raw device.
+ Type: String
++ NeutronDnsmasqOptions:
++ Default: 'dhcp-option-force=26,1400'
++ Description: Dnsmasq options for neutron-dhcp-agent. The default value here forces MTU to be set to 1400 to account for the gre tunnel overhead.
++ Type: String
+ notcomputeImage:
+ Type: String
+ Default: overcloud-control
+@@ -443,6 +447,8 @@ Resources:
+ ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
+ service-password:
+ Ref: NeutronPassword
++ dnsmasq-options:
++ Ref: NeutronDnsmasqOptions
+ ceilometer:
+ db: mysql://ceilometer:unset@localhost/ceilometer
+ metering_secret: {Ref: CeilometerMeteringSecret}
diff --git a/0004-Use-127.0.0.1-in-mysql-connection-url.patch b/0004-Use-127.0.0.1-in-mysql-connection-url.patch
new file mode 100644
index 0000000..34f1d19
--- /dev/null
+++ b/0004-Use-127.0.0.1-in-mysql-connection-url.patch
@@ -0,0 +1,207 @@
+From 59680e947a87cc039c9eef5408b9a9650fd64800 Mon Sep 17 00:00:00 2001
+From: Richard Su <rwsu at redhat.com>
+Date: Thu, 10 Apr 2014 17:53:13 -0700
+Subject: [PATCH] Use 127.0.0.1 in mysql connection url
+
+Substituted localhost with 127.0.0.1.
+
+By default, systems with selinux enabled do not allow socket based
+connections to mysql. Socket based connections are used when
+localhost is in the mysql connection url.
+
+Change-Id: Ic65dc9a58f2a8909b371ef5718b0693df9e6054e
+---
+ overcloud-source.yaml | 14 +++++++-------
+ tuskar-source.yaml | 2 +-
+ undercloud-bm-source.yaml | 4 ++--
+ undercloud-source.yaml | 10 +++++-----
+ undercloud-vm-ironic-source.yaml | 4 ++--
+ undercloud-vm-source.yaml | 4 ++--
+ 6 files changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/overcloud-source.yaml b/overcloud-source.yaml
+index 37acb84..9c11e32 100644
+--- a/overcloud-source.yaml
++++ b/overcloud-source.yaml
+@@ -314,7 +314,7 @@ Resources:
+ public_interface_ip:
+ Ref: NeutronPublicInterfaceIP
+ cinder:
+- db: mysql://cinder:unset@localhost/cinder
++ db: mysql://cinder:unset@127.0.0.1/cinder
+ volume_size_mb: '5000'
+ service-password:
+ Ref: CinderPassword
+@@ -331,7 +331,7 @@ Resources:
+ db-password: unset
+ glance:
+ backend: swift
+- db: mysql://glance:unset@localhost/glance
++ db: mysql://glance:unset@127.0.0.1/glance
+ host:
+ Fn::Select:
+ - 0
+@@ -355,7 +355,7 @@ Resources:
+ admin_tenant_name: service
+ admin_user: heat
+ auth_encryption_key: unset___________
+- db: mysql://heat:unset@localhost/heat
++ db: mysql://heat:unset@127.0.0.1/heat
+ stack_domain_admin_password: {Ref: HeatStackDomainAdminPassword}
+ watch_server_url:
+ Fn::Join:
+@@ -405,7 +405,7 @@ Resources:
+ - networks
+ - {Ref: CloudName}
+ keystone:
+- db: mysql://keystone:unset@localhost/keystone
++ db: mysql://keystone:unset@127.0.0.1/keystone
+ host:
+ Fn::Select:
+ - 0
+@@ -444,19 +444,19 @@ Resources:
+ Ref: NeutronPublicInterfaceDefaultRoute
+ physical_bridge: br-ex
+ tenant_network_type: gre
+- ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
++ ovs_db: mysql://neutron:unset@127.0.0.1/ovs_neutron?charset=utf8
+ service-password:
+ Ref: NeutronPassword
+ dnsmasq-options:
+ Ref: NeutronDnsmasqOptions
+ ceilometer:
+- db: mysql://ceilometer:unset@localhost/ceilometer
++ db: mysql://ceilometer:unset@127.0.0.1/ceilometer
+ metering_secret: {Ref: CeilometerMeteringSecret}
+ service-password:
+ Ref: CeilometerPassword
+ nova:
+ compute_driver: libvirt.LibvirtDriver
+- db: mysql://nova:unset@localhost/nova
++ db: mysql://nova:unset@127.0.0.1/nova
+ default_floating_pool:
+ ext-net
+ host:
+diff --git a/tuskar-source.yaml b/tuskar-source.yaml
+index 6f84292..b47ce98 100644
+--- a/tuskar-source.yaml
++++ b/tuskar-source.yaml
+@@ -13,7 +13,7 @@ Resources:
+ Metadata:
+ OpenStack::Role: undercloudConfig
+ tuskar:
+- db: mysql://tuskar:unset@localhost/tuskar?charset=utf8
++ db: mysql://tuskar:unset@127.0.0.1/tuskar?charset=utf8
+ user: admin
+ tenant_name: admin
+ password: {Ref: AdminPassword}
+diff --git a/undercloud-bm-source.yaml b/undercloud-bm-source.yaml
+index ff00d28..4f38217 100644
+--- a/undercloud-bm-source.yaml
++++ b/undercloud-bm-source.yaml
+@@ -14,7 +14,7 @@ Resources:
+ nova:
+ compute_hostname: undercloud
+ compute_driver: baremetal.driver.BareMetalDriver
+- db: mysql://nova:unset@localhost/nova
++ db: mysql://nova:unset@127.0.0.1/nova
+ default_ephemeral_format: ext4
+ host: 127.0.0.1
+ metadata-proxy: false
+@@ -24,7 +24,7 @@ Resources:
+ baremetal:
+ arch:
+ Ref: BaremetalArch
+- db: mysql://nova:unset@localhost/nova_bm
++ db: mysql://nova:unset@127.0.0.1/nova_bm
+ power_manager:
+ Ref: PowerManager
+ pxe_deploy_timeout: 2400
+diff --git a/undercloud-source.yaml b/undercloud-source.yaml
+index 90724b7..bfed9e7 100644
+--- a/undercloud-source.yaml
++++ b/undercloud-source.yaml
+@@ -130,14 +130,14 @@ Resources:
+ - undercloud
+ - networks
+ cinder:
+- db: mysql://cinder:unset@localhost/cinder
++ db: mysql://cinder:unset@127.0.0.1/cinder
+ volume_size_mb: '5000'
+ completion-handle:
+ Ref: notCompute0CompletionHandle
+ db-password: unset
+ glance:
+ backend: file
+- db: mysql://glance:unset@localhost/glance
++ db: mysql://glance:unset@127.0.0.1/glance
+ host: 127.0.0.1
+ service-password:
+ Ref: GlancePassword
+@@ -151,7 +151,7 @@ Resources:
+ admin_tenant_name: service
+ admin_user: heat
+ auth_encryption_key: unset___________
+- db: mysql://heat:unset@localhost/heat
++ db: mysql://heat:unset@127.0.0.1/heat
+ stack_domain_admin_password: {Ref: HeatStackDomainAdminPassword}
+ watch_server_url:
+ Fn::Join:
+@@ -201,11 +201,11 @@ Resources:
+ stack_name:
+ Ref: AWS::StackName
+ keystone:
+- db: mysql://keystone:unset@localhost/keystone
++ db: mysql://keystone:unset@127.0.0.1/keystone
+ host: 127.0.0.1
+ neutron:
+ host: 127.0.0.1
+- ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
++ ovs_db: mysql://neutron:unset@127.0.0.1/ovs_neutron?charset=utf8
+ ovs:
+ public_interface:
+ Ref: NeutronPublicInterface
+diff --git a/undercloud-vm-ironic-source.yaml b/undercloud-vm-ironic-source.yaml
+index 2e9555a..d2f0855 100644
+--- a/undercloud-vm-ironic-source.yaml
++++ b/undercloud-vm-ironic-source.yaml
+@@ -16,7 +16,7 @@ Resources:
+ Type: AWS::AutoScaling::LaunchConfiguration
+ Metadata:
+ ironic:
+- db: mysql://ironic:unset@localhost/ironic
++ db: mysql://ironic:unset@127.0.0.1/ironic
+ service-password:
+ Ref: IronicPassword
+ virtual_power_ssh_key:
+@@ -25,7 +25,7 @@ Resources:
+ compute_hostname: undercloud
+ compute_driver: ironic.nova.virt.ironic.driver.IronicDriver
+ compute_manager: ironic.nova.compute.manager.ClusteredComputeManager
+- db: mysql://nova:unset@localhost/nova
++ db: mysql://nova:unset@127.0.0.1/nova
+ default_ephemeral_format: ext4
+ host: 127.0.0.1
+ metadata-proxy: false
+diff --git a/undercloud-vm-source.yaml b/undercloud-vm-source.yaml
+index 48a6fff..f991e3e 100644
+--- a/undercloud-vm-source.yaml
++++ b/undercloud-vm-source.yaml
+@@ -26,7 +26,7 @@ Resources:
+ nova:
+ compute_hostname: undercloud
+ compute_driver: baremetal.driver.BareMetalDriver
+- db: mysql://nova:unset@localhost/nova
++ db: mysql://nova:unset@127.0.0.1/nova
+ default_ephemeral_format: ext4
+ host: 127.0.0.1
+ metadata-proxy: false
+@@ -36,7 +36,7 @@ Resources:
+ baremetal:
+ arch:
+ Ref: BaremetalArch
+- db: mysql://nova:unset@localhost/nova_bm
++ db: mysql://nova:unset@127.0.0.1/nova_bm
+ power_manager:
+ Ref: PowerManager
+ pxe_deploy_timeout: 2400
More information about the scm-commits
mailing list