Merge "Open up firewall for the control-ports in the bundles"

diff --combined docker/services/pacemaker/database/mysql.yaml
index 22c29b2,86dcd30..f12852f
--- 1/docker/services/pacemaker/database/mysql.yaml
--- 2/docker/services/pacemaker/database/mysql.yaml
+++ b/docker/services/pacemaker/database/mysql.yaml
@@@ -65,6 -65,17 +65,17 @@@ outputs
          map_merge:
            - {get_attr: [MysqlPuppetBase, role_data, config_settings]}
            - tripleo::profile::pacemaker::database::mysql_bundle::mysql_docker_image: &mysql_image {get_param: DockerMysqlImage}
+             tripleo::profile::pacemaker::database::mysql_bundle::control_port: 3123
+             tripleo.mysql.firewall_rules:
+               '104 mysql galera-bundle':
+                 dport:
+                   - 873
+                   - 3123
+                   - 3306
+                   - 4444
+                   - 4567
+                   - 4568
+                   - 9200
        step_config: ""
        # BEGIN DOCKER SETTINGS #
        puppet_config:
@@@ -164,27 -175,6 +175,27 @@@
              path: /var/lib/mysql
              state: directory
        upgrade_tasks:
 -        - name: Stop and disable mysql service
 +        - name: get bootstrap nodeid
 +          tags: common
 +          command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
 +          register: bootstrap_node
 +        - name: set is_bootstrap_node fact
 +          tags: common
 +          set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
 +        - name: Disable the galera cluster resource
            tags: step2
 -          service: name=mariadb state=stopped enabled=no
 +          pacemaker_resource:
 +            resource: galera
 +            state: disable
 +            wait_for_resource: true
 +          when: is_bootstrap_node
 +        - name: Delete the stopped galera cluster resource.
 +          tags: step2
 +          pacemaker_resource:
 +            resource: galera
 +            state: delete
 +            wait_for_resource: true
 +          when: is_bootstrap_node
 +        - name: Disable mysql service
 +          tags: step2
 +          service: name=mariadb enabled=no

diff --combined docker/services/pacemaker/database/redis.yaml
index df7ae7f,087a580..75b6d65
--- 1/docker/services/pacemaker/database/redis.yaml
--- 2/docker/services/pacemaker/database/redis.yaml
+++ b/docker/services/pacemaker/database/redis.yaml
@@@ -61,7 -61,13 +61,13 @@@ outputs
              redis::notify_service: false
              redis::managed_by_cluster_manager: true
              tripleo::profile::pacemaker::database::redis_bundle::redis_docker_image: &redis_image {get_param: DockerRedisImage}
- 
+             tripleo::profile::pacemaker::database::redis_bundle::control_port: 3124
+             tripleo.redis.firewall_rules:
+               '108 redis-bundle':
+                 dport:
+                   - 3124
+                   - 6379
+                   - 26379
        step_config: ""
        service_config_settings: {get_attr: [RedisBase, role_data, service_config_settings]}
        # BEGIN DOCKER SETTINGS
@@@ -139,27 -145,6 +145,27 @@@
              path: /var/lib/redis
              state: directory
        upgrade_tasks:
 -        - name: Stop and disable redis service
 +        - name: get bootstrap nodeid
 +          tags: common
 +          command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
 +          register: bootstrap_node
 +        - name: set is_bootstrap_node fact
 +          tags: common
 +          set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
 +        - name: Disable the redis cluster resource
            tags: step2
 -          service: name=redis state=stopped enabled=no
 +          pacemaker_resource:
 +            resource: {get_attr: [RedisBase, role_data, service_name]}
 +            state: disable
 +            wait_for_resource: true
 +          when: is_bootstrap_node
 +        - name: Delete the stopped redis cluster resource.
 +          tags: step2
 +          pacemaker_resource:
 +            resource: {get_attr: [RedisBase, role_data, service_name]}
 +            state: delete
 +            wait_for_resource: true
 +          when: is_bootstrap_node
 +        - name: Disable redis service
 +          tags: step2
 +          service: name=redis enabled=no

diff --combined docker/services/pacemaker/rabbitmq.yaml
index dc56bcc,a2b635f..de53cee
--- 1/docker/services/pacemaker/rabbitmq.yaml
--- 2/docker/services/pacemaker/rabbitmq.yaml
+++ b/docker/services/pacemaker/rabbitmq.yaml
@@@ -63,6 -63,14 +63,14 @@@ outputs
            - {get_attr: [RabbitmqBase, role_data, config_settings]}
            - rabbitmq::service_manage: false
              tripleo::profile::pacemaker::rabbitmq_bundle::rabbitmq_docker_image: &rabbitmq_image {get_param: DockerRabbitmqImage}
+             tripleo::profile::pacemaker::rabbitmq_bundle::control_port: 3122
+             tripleo.rabbitmq.firewall_rules:
+               '109 rabbitmq-bundle':
+                 dport:
+                   - 3122
+                   - 4369
+                   - 5672
+                   - 25672
        step_config: &step_config
          get_attr: [RabbitmqBase, role_data, step_config]
        service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
@@@ -157,27 -165,6 +165,27 @@@
              echo 'export ERL_EPMD_PORT=4370' >> /etc/rabbitmq/rabbitmq-env.conf
              for pid in $(pgrep epmd); do if [ "$(lsns -o NS -p $pid)" == "$(lsns -o NS -p 1)" ]; then kill $pid; break; fi; done
        upgrade_tasks:
 -        - name: Stop and disable rabbitmq service
 +        - name: get bootstrap nodeid
 +          tags: common
 +          command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
 +          register: bootstrap_node
 +        - name: set is_bootstrap_node fact
 +          tags: common
 +          set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
 +        - name: Disable the rabbitmq cluster resource.
            tags: step2
 -          service: name=rabbitmq-server state=stopped enabled=no
 +          pacemaker_resource:
 +            resource: {get_attr: [RabbitmqBase, role_data, service_name]}
 +            state: disable
 +            wait_for_resource: true
 +          when: is_bootstrap_node
 +        - name: Delete the stopped rabbitmq cluster resource.
 +          tags: step2
 +          pacemaker_resource:
 +            resource: {get_attr: [RabbitmqBase, role_data, service_name]}
 +            state: delete
 +            wait_for_resource: true
 +          when: is_bootstrap_node
 +        - name: Disable rabbitmq service
 +          tags: step2
 +          service: name=rabbitmq-server enabled=no