Skip to content

Commit

Permalink
test fix for mysql start timeout
Browse files Browse the repository at this point in the history
Here I'm testing a fix in OSA, but changing the submodule to point at
my fork of osa where I have made a patch.  I have to do it this way
because OSA doesn't do upgrade testing of mariadb between kilo and
liberty, which explains why we're only seeing this mostly in rpco.
  • Loading branch information
mancdaz committed Jul 6, 2016
1 parent 83bb833 commit 71203fe
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "openstack-ansible"]
path = openstack-ansible
url = https://git.openstack.org/openstack/openstack-ansible
url = https://github.com/mancdaz/openstack-ansible
2 changes: 1 addition & 1 deletion openstack-ansible
Submodule openstack-ansible updated 56 files
+1 −1 ansible-role-requirements.yml
+1 −2 doc/source/upgrade-guide/index.rst
+74 −110 doc/source/upgrade-guide/manual-upgrade.rst
+19 −18 doc/source/upgrade-guide/overview.rst
+31 −30 doc/source/upgrade-guide/scripts.rst
+60 −93 doc/source/upgrade-guide/upgrade-playbooks.rst
+3 −3 playbooks/defaults/repo_packages/openstack_other.yml
+14 −14 playbooks/defaults/repo_packages/openstack_services.yml
+1 −1 playbooks/inventory/group_vars/all.yml
+3 −3 playbooks/inventory/group_vars/hosts.yml
+10 −225 playbooks/plugins/actions/config_template.py
+8 −17 playbooks/rabbitmq-install.yml
+0 −1 playbooks/roles/galera_client/defaults/main.yml
+9 −0 playbooks/roles/galera_server/tasks/galera_install.yml
+6 −15 playbooks/roles/galera_server/tasks/galera_upgrade_post.yml
+0 −1 playbooks/roles/memcached_server/defaults/main.yml
+0 −16 playbooks/roles/memcached_server/tasks/memcached_config.yml
+31 −7 playbooks/roles/openstack_hosts/tasks/openstack_update_hosts_file.yml
+0 −10 playbooks/roles/openstack_hosts/templates/openstack-host-hostfile-setup.sh.j2
+0 −6 playbooks/roles/os_horizon/defaults/main.yml
+0 −8 playbooks/roles/os_horizon/templates/horizon_local_settings.py.j2
+1 −1 playbooks/roles/os_horizon/templates/openstack_dashboard.conf.j2
+0 −1 playbooks/roles/os_keystone/defaults/main.yml
+2 −2 playbooks/roles/os_keystone/templates/keystone-httpd.conf.j2
+1 −1 playbooks/roles/os_neutron/defaults/main.yml
+0 −7 playbooks/roles/os_neutron/files/rootwrap.d/iptables-firewall.filters
+7 −4 playbooks/roles/os_neutron/templates/metadata_agent.ini.j2
+0 −3 playbooks/roles/os_nova/defaults/main.yml
+0 −23 playbooks/roles/os_nova/tasks/nova_compute_kvm_install.yml
+0 −1 playbooks/roles/os_nova/tasks/nova_pre_install.yml
+1 −14 playbooks/roles/os_swift/defaults/main.yml
+0 −3 playbooks/roles/os_swift/templates/account-server.conf.j2
+0 −3 playbooks/roles/os_swift/templates/container-server.conf.j2
+0 −3 playbooks/roles/os_swift/templates/object-server.conf.j2
+4 −4 playbooks/roles/os_swift/templates/proxy-server.conf.j2
+2 −5 playbooks/roles/os_swift/templates/swift-dispersion.conf.j2
+1 −1 playbooks/roles/os_swift/templates/swift.conf.j2
+0 −7 playbooks/roles/repo_server/tasks/repo_pre_install.yml
+2 −577 playbooks/roles/repo_server/templates/lsyncd.lua.j2
+0 −11 releasenotes/notes/add-nova-extensions-blacklist-8ed18f45aba6a7fb.yaml
+0 −12 releasenotes/notes/ceilometer-swift-v2keystone-e948db5b5748d236.yaml
+0 −29 releasenotes/notes/config_template-MultiStrOps-support-c28e33fd5044e14d.yaml
+0 −15 releasenotes/notes/disable_slave_repo_during_sync-47034c9a6a56b85d.yaml
+0 −13 releasenotes/notes/kilo-upgrade-glance-keystonev3-swift-fix-61a57581176816e4.yaml
+0 −9 releasenotes/notes/memcached_server-add-nofile-setting-504e0c50e10a4ea6.yaml
+0 −6 releasenotes/notes/nova-admin-endpoint-fix-d52cc00caa5ab5dd.yaml
+0 −5 releasenotes/notes/os-horizon-apache-log-format-support-34c9ef74b3bcce31.yaml
+0 −4 releasenotes/notes/os-keystone-apache-log-format-support-7232177f835222ee.yaml
+0 −9 releasenotes/notes/swift-conf-b8dd5e1199f8e4a8.yaml
+0 −8 releasenotes/notes/swift-fallocate-reserve-ff513025da68bfed.yaml
+0 −8 releasenotes/notes/symlink_libvirt_save_dir_to_nova_dir-eb1ec5c7a415393d.yaml
+2 −2 requirements.txt
+1 −2 scripts/run-upgrade.sh
+1 −1 scripts/scripts-library.sh
+0 −43 scripts/upgrade-utilities/playbooks/glance-db-storage-url-fix.yml
+1 −1 tests/roles/bootstrap-host/tasks/prepare_libvirt_service.yml

0 comments on commit 71203fe

Please sign in to comment.