diff options
Diffstat (limited to 'deploy')
24 files changed, 45 insertions, 8 deletions
diff --git a/deploy/adapters/ansible/roles/ceph-deploy/tasks/main.yml b/deploy/adapters/ansible/roles/ceph-deploy/tasks/main.yml index 75ed1da2..1b04f3c6 100644 --- a/deploy/adapters/ansible/roles/ceph-deploy/tasks/main.yml +++ b/deploy/adapters/ansible/roles/ceph-deploy/tasks/main.yml @@ -28,3 +28,5 @@ - ceph_deploy - ceph_openstack_conf - ceph_openstack + +- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/cinder-controller/tasks/main.yml b/deploy/adapters/ansible/roles/cinder-controller/tasks/main.yml index 5491dcf0..1df53e24 100644 --- a/deploy/adapters/ansible/roles/cinder-controller/tasks/main.yml +++ b/deploy/adapters/ansible/roles/cinder-controller/tasks/main.yml @@ -13,3 +13,5 @@ - config - cinder-config - cinder + +- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf b/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf index 3714aa50..8ecda649 100644 --- a/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf +++ b/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf @@ -3,7 +3,7 @@ rootwrap_config = /etc/cinder/rootwrap.conf api_paste_confg = /etc/cinder/api-paste.ini iscsi_helper = tgtadm volume_name_template = volume-%s -volume_group = cinder-volumes +volume_group = storage-volumes verbose = {{ VERBOSE }} debug = {{ DEBUG }} auth_strategy = keystone @@ -39,7 +39,6 @@ volume_name_template = volume-%s snapshot_name_template = snapshot-%s max_gigabytes=10000 -volume_group=cinder-volumes volume_clear=zero volume_clear_size=10 diff --git a/deploy/adapters/ansible/roles/cinder-volume/tasks/main.yml b/deploy/adapters/ansible/roles/cinder-volume/tasks/main.yml index 3765071e..c0da9984 100644 --- a/deploy/adapters/ansible/roles/cinder-volume/tasks/main.yml +++ b/deploy/adapters/ansible/roles/cinder-volume/tasks/main.yml @@ -14,3 +14,5 @@ backup=yes notify: - restart cinder-volume services + +- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf b/deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf index 75288946..4d8e49ce 100644 --- a/deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf +++ b/deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf @@ -38,7 +38,6 @@ volume_name_template = volume-%s snapshot_name_template = snapshot-%s max_gigabytes=10000 -volume_group=cinder-volumes volume_clear=zero volume_clear_size=10 diff --git a/deploy/adapters/ansible/roles/common/tasks/main.yml b/deploy/adapters/ansible/roles/common/tasks/main.yml index 1276429d..b9c52c3e 100644 --- a/deploy/adapters/ansible/roles/common/tasks/main.yml +++ b/deploy/adapters/ansible/roles/common/tasks/main.yml @@ -70,3 +70,5 @@ - name: kill daemon for accelerate shell: lsof -ni :5099|grep LISTEN|awk '{print $2}'|xargs kill -9 ignore_errors: true + +- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/database/tasks/main.yml b/deploy/adapters/ansible/roles/database/tasks/main.yml index bfdcb75b..314a85bd 100644 --- a/deploy/adapters/ansible/roles/database/tasks/main.yml +++ b/deploy/adapters/ansible/roles/database/tasks/main.yml @@ -13,3 +13,5 @@ - include: mongodb_config.yml when: - inventory_hostname == haproxy_hosts.keys()[0] + +- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/database/tasks/mongodb_config.yml b/deploy/adapters/ansible/roles/database/tasks/mongodb_config.yml index 1c118afb..321c38d5 100755 --- a/deploy/adapters/ansible/roles/database/tasks/mongodb_config.yml +++ b/deploy/adapters/ansible/roles/database/tasks/mongodb_config.yml @@ -11,8 +11,8 @@ shell: mongo compass --eval 'printjson(rs.status())'|grep -E 'PRIMARY|SECONDARY'|wc -l register: servers until: servers.stdout|int == 3 - retries: 30 - delay: 6 + retries: 60 + delay: 10 - debug: msg='{{ servers.stdout |int }}' diff --git a/deploy/adapters/ansible/roles/glance/tasks/main.yml b/deploy/adapters/ansible/roles/glance/tasks/main.yml index f5ec3c79..4759fdf4 100644 --- a/deploy/adapters/ansible/roles/glance/tasks/main.yml +++ b/deploy/adapters/ansible/roles/glance/tasks/main.yml @@ -17,3 +17,5 @@ - config - glance_config - glance + +- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/ha/tasks/main.yml b/deploy/adapters/ansible/roles/ha/tasks/main.yml index f60740a3..8eb9f1b7 100644 --- a/deploy/adapters/ansible/roles/ha/tasks/main.yml +++ b/deploy/adapters/ansible/roles/ha/tasks/main.yml @@ -84,3 +84,5 @@ - name: restart rsyslog shell: service rsyslog restart + +- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/heat/tasks/main.yml b/deploy/adapters/ansible/roles/heat/tasks/main.yml index cf259eb5..d0823d1e 100644 --- a/deploy/adapters/ansible/roles/heat/tasks/main.yml +++ b/deploy/adapters/ansible/roles/heat/tasks/main.yml @@ -12,3 +12,4 @@ - heat_config - heat +- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/keystone/tasks/main.yml b/deploy/adapters/ansible/roles/keystone/tasks/main.yml index aa3ff1d5..f084a38e 100644 --- a/deploy/adapters/ansible/roles/keystone/tasks/main.yml +++ b/deploy/adapters/ansible/roles/keystone/tasks/main.yml @@ -11,3 +11,5 @@ - config - keystone_config - keystone + +- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/memcached/tasks/main.yml b/deploy/adapters/ansible/roles/memcached/tasks/main.yml index 8b955cbb..58a7ae3e 100644 --- a/deploy/adapters/ansible/roles/memcached/tasks/main.yml +++ b/deploy/adapters/ansible/roles/memcached/tasks/main.yml @@ -11,3 +11,5 @@ - name: restart services service: name={{ item }} state=restarted enabled=yes with_items: services| union(services_noarch) + +- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/monitor/tasks/main.yml b/deploy/adapters/ansible/roles/monitor/tasks/main.yml index 6e446944..1cc21fe0 100644 --- a/deploy/adapters/ansible/roles/monitor/tasks/main.yml +++ b/deploy/adapters/ansible/roles/monitor/tasks/main.yml @@ -10,4 +10,5 @@ - name: restart cron service: name={{ cron }} state=restarted +- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/mq/tasks/main.yml b/deploy/adapters/ansible/roles/mq/tasks/main.yml index 84d4a94e..521f5995 100644 --- a/deploy/adapters/ansible/roles/mq/tasks/main.yml +++ b/deploy/adapters/ansible/roles/mq/tasks/main.yml @@ -5,3 +5,5 @@ - include: rabbitmq_config.yml when: inventory_hostname == haproxy_hosts.keys()[0] + +- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml b/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml index f3474ea4..0d7bb2d9 100644 --- a/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml +++ b/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml @@ -46,4 +46,3 @@ - include: ../../neutron-network/tasks/odl.yml when: "'opendaylight' in {{ NEUTRON_MECHANISM_DRIVERS }}" - diff --git a/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml b/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml index 5825c5fe..a0d3b343 100644 --- a/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml +++ b/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml @@ -11,3 +11,5 @@ - config - neutron_config - neutron + +- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml b/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml index fc1bc638..d02747af 100644 --- a/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml +++ b/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml @@ -87,3 +87,5 @@ with_flattened: - services_noarch - services + +- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/nova-compute/tasks/main.yml b/deploy/adapters/ansible/roles/nova-compute/tasks/main.yml index 45dab3f8..6c30f25b 100644 --- a/deploy/adapters/ansible/roles/nova-compute/tasks/main.yml +++ b/deploy/adapters/ansible/roles/nova-compute/tasks/main.yml @@ -23,7 +23,7 @@ lineinfile: dest=/opt/service create=yes line='{{ item }}' with_items: services | union(services_noarch) -- meta: flush_handlers - - name: remove nova sqlite db shell: rm /var/lib/nova/nova.sqlite || touch nova.sqlite.removed + +- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/nova-controller/tasks/main.yml b/deploy/adapters/ansible/roles/nova-controller/tasks/main.yml index da820c35..00a25284 100644 --- a/deploy/adapters/ansible/roles/nova-controller/tasks/main.yml +++ b/deploy/adapters/ansible/roles/nova-controller/tasks/main.yml @@ -11,3 +11,5 @@ - config - nova_config - nova + +- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/secgroup/tasks/main.yml b/deploy/adapters/ansible/roles/secgroup/tasks/main.yml index c26af4b0..6419208b 100644 --- a/deploy/adapters/ansible/roles/secgroup/tasks/main.yml +++ b/deploy/adapters/ansible/roles/secgroup/tasks/main.yml @@ -8,3 +8,5 @@ - include: secgroup.yml when: '{{ enable_secgroup }} == False' tags: secgroup + +- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/setup-network/tasks/main.yml b/deploy/adapters/ansible/roles/setup-network/tasks/main.yml index 6f024f18..51821b09 100644 --- a/deploy/adapters/ansible/roles/setup-network/tasks/main.yml +++ b/deploy/adapters/ansible/roles/setup-network/tasks/main.yml @@ -50,3 +50,5 @@ - name: add to boot scripts service: name=net_init enabled=yes + +- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/storage/tasks/main.yml b/deploy/adapters/ansible/roles/storage/tasks/main.yml index ee4c97e5..4185dc91 100755 --- a/deploy/adapters/ansible/roles/storage/tasks/main.yml +++ b/deploy/adapters/ansible/roles/storage/tasks/main.yml @@ -16,3 +16,5 @@ when: status.stat.exists == True and status.stat.isblk == True tags: - storage + +- meta: flush_handlers diff --git a/deploy/network.sh b/deploy/network.sh index 836af0f9..c6d0df5d 100755 --- a/deploy/network.sh +++ b/deploy/network.sh @@ -1,4 +1,9 @@ +function clear_forward_rejct_rules() +{ + while sudo iptables -nL FORWARD --line-number|grep -E 'REJECT +all +-- +0.0.0.0/0 +0.0.0.0/0 +reject-with icmp-port-unreachable'|head -1|awk '{print $1}'|xargs sudo iptables -D FORWARD; do :; done +} + function setup_bridge_net() { net_name=$1 @@ -89,4 +94,5 @@ function create_nets() { # create external network setup_bridge_external + clear_forward_rejct_rules } |