24 files changed, 7 insertions, 6 deletions
diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
index 663f02b8..417c0546 100644
--- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
+++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
@@ -10,7 +10,7 @@
 - hosts: all
   remote_user: root
   roles:
-    - pre-prepare
+    - pre-openstack
 
 - hosts: controller
   remote_user: root
@@ -25,11 +25,9 @@
 - hosts: localhost
   remote_user: root
   roles:
-    - role: config-deployment
+    - role: config-osa
     - role: setup-host
     - role: setup-infrastructure
     - role: setup-openstack
     - role: setup-openvswitch
-      when: NEUTRON_MECHANISM_DRIVERS[0] == "openvswitch" or
-             NEUTRON_MECHANISM_DRIVERS[0] == "opendaylight"
-    - role: openstack-post
+    - role: post-openstack
diff --git a/deploy/adapters/ansible/roles/config-deployment/files/cinder.yml b/deploy/adapters/ansible/roles/config-osa/files/cinder.yml
index 3a39935a..3a39935a 100755
--- a/deploy/adapters/ansible/roles/config-deployment/files/cinder.yml
+++ b/deploy/adapters/ansible/roles/config-osa/files/cinder.yml
diff --git a/deploy/adapters/ansible/roles/config-deployment/files/http.yml b/deploy/adapters/ansible/roles/config-osa/files/http.yml
index 248fc06d..248fc06d 100644
--- a/deploy/adapters/ansible/roles/config-deployment/files/http.yml
+++ b/deploy/adapters/ansible/roles/config-osa/files/http.yml
diff --git a/deploy/adapters/ansible/roles/config-deployment/files/os-flavor/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/files/os-flavor/tasks/main.yml
index 03b57120..03b57120 100644
--- a/deploy/adapters/ansible/roles/config-deployment/files/os-flavor/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/config-osa/files/os-flavor/tasks/main.yml
diff --git a/deploy/adapters/ansible/roles/config-deployment/files/os-flavor/vars/main.yml b/deploy/adapters/ansible/roles/config-osa/files/os-flavor/vars/main.yml
index d9c36d42..d9c36d42 100644
--- a/deploy/adapters/ansible/roles/config-deployment/files/os-flavor/vars/main.yml
+++ b/deploy/adapters/ansible/roles/config-osa/files/os-flavor/vars/main.yml
diff --git a/deploy/adapters/ansible/roles/config-deployment/files/setup-ovs.yml b/deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml
index 57bc5ef1..57bc5ef1 100644
--- a/deploy/adapters/ansible/roles/config-deployment/files/setup-ovs.yml
+++ b/deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml
diff --git a/deploy/adapters/ansible/roles/config-deployment/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
index 8246d6e7..8246d6e7 100644
--- a/deploy/adapters/ansible/roles/config-deployment/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
diff --git a/deploy/adapters/ansible/roles/config-deployment/templates/ansible.cfg b/deploy/adapters/ansible/roles/config-osa/templates/ansible.cfg
index 41502fbf..41502fbf 100644
--- a/deploy/adapters/ansible/roles/config-deployment/templates/ansible.cfg
+++ b/deploy/adapters/ansible/roles/config-osa/templates/ansible.cfg
diff --git a/deploy/adapters/ansible/roles/config-deployment/templates/create-flavor.yml.j2 b/deploy/adapters/ansible/roles/config-osa/templates/create-flavor.yml.j2
index b33cd414..b33cd414 100644
--- a/deploy/adapters/ansible/roles/config-deployment/templates/create-flavor.yml.j2
+++ b/deploy/adapters/ansible/roles/config-osa/templates/create-flavor.yml.j2
diff --git a/deploy/adapters/ansible/roles/config-deployment/templates/create-network.yml.j2 b/deploy/adapters/ansible/roles/config-osa/templates/create-network.yml.j2
index 419b9b18..419b9b18 100644
--- a/deploy/adapters/ansible/roles/config-deployment/templates/create-network.yml.j2
+++ b/deploy/adapters/ansible/roles/config-osa/templates/create-network.yml.j2
diff --git a/deploy/adapters/ansible/roles/config-deployment/templates/openstack_user_config.yml.j2 b/deploy/adapters/ansible/roles/config-osa/templates/openstack_user_config.yml.j2
index 2a24113b..2a24113b 100644
--- a/deploy/adapters/ansible/roles/config-deployment/templates/openstack_user_config.yml.j2
+++ b/deploy/adapters/ansible/roles/config-osa/templates/openstack_user_config.yml.j2
diff --git a/deploy/adapters/ansible/roles/config-deployment/templates/user_variables.yml.j2 b/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2
index 443a3f5b..5157f758 100644
--- a/deploy/adapters/ansible/roles/config-deployment/templates/user_variables.yml.j2
+++ b/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2
@@ -26,6 +26,7 @@ haproxy_keepalived_external_vip_cidr: "{{ public_vip.ip }}/32"
 haproxy_keepalived_internal_vip_cidr: "10.1.0.22/32"
 haproxy_keepalived_external_interface: br-vlan
 haproxy_keepalived_internal_interface: br-mgmt
+keepalived_ping_address: "{{ ntp_server }}"
 
 {% if "openvswitch" == NEUTRON_MECHANISM_DRIVERS[0] or
    "opendaylight" == NEUTRON_MECHANISM_DRIVERS[0]
diff --git a/deploy/adapters/ansible/roles/openstack-post/tasks/main.yml b/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml
index d5182c95..d5182c95 100644
--- a/deploy/adapters/ansible/roles/openstack-post/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml
diff --git a/deploy/adapters/ansible/roles/openstack-post/vars/main.yml b/deploy/adapters/ansible/roles/post-openstack/vars/main.yml
index d9c36d42..d9c36d42 100644
--- a/deploy/adapters/ansible/roles/openstack-post/vars/main.yml
+++ b/deploy/adapters/ansible/roles/post-openstack/vars/main.yml
diff --git a/deploy/adapters/ansible/roles/pre-prepare/files/centos_base.repo b/deploy/adapters/ansible/roles/pre-openstack/files/centos_base.repo
index ba768e0a..ba768e0a 100644
--- a/deploy/adapters/ansible/roles/pre-prepare/files/centos_base.repo
+++ b/deploy/adapters/ansible/roles/pre-openstack/files/centos_base.repo
diff --git a/deploy/adapters/ansible/roles/pre-prepare/files/modules b/deploy/adapters/ansible/roles/pre-openstack/files/modules
index c73925e6..c73925e6 100644
--- a/deploy/adapters/ansible/roles/pre-prepare/files/modules
+++ b/deploy/adapters/ansible/roles/pre-openstack/files/modules
diff --git a/deploy/adapters/ansible/roles/pre-prepare/tasks/RedHat.yml b/deploy/adapters/ansible/roles/pre-openstack/tasks/RedHat.yml
index 5456c9fc..5456c9fc 100644
--- a/deploy/adapters/ansible/roles/pre-prepare/tasks/RedHat.yml
+++ b/deploy/adapters/ansible/roles/pre-openstack/tasks/RedHat.yml
diff --git a/deploy/adapters/ansible/roles/pre-prepare/tasks/Ubuntu.yml b/deploy/adapters/ansible/roles/pre-openstack/tasks/Ubuntu.yml
index a0f7d015..a0f7d015 100644
--- a/deploy/adapters/ansible/roles/pre-prepare/tasks/Ubuntu.yml
+++ b/deploy/adapters/ansible/roles/pre-openstack/tasks/Ubuntu.yml
diff --git a/deploy/adapters/ansible/roles/pre-prepare/tasks/main.yml b/deploy/adapters/ansible/roles/pre-openstack/tasks/main.yml
index 76203440..76203440 100644
--- a/deploy/adapters/ansible/roles/pre-prepare/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/pre-openstack/tasks/main.yml
diff --git a/deploy/adapters/ansible/roles/common/templates/hosts b/deploy/adapters/ansible/roles/pre-openstack/templates/hosts
index bb770d5b..bb770d5b 100644
--- a/deploy/adapters/ansible/roles/common/templates/hosts
+++ b/deploy/adapters/ansible/roles/pre-openstack/templates/hosts
diff --git a/deploy/adapters/ansible/roles/pre-prepare/templates/sources.list b/deploy/adapters/ansible/roles/pre-openstack/templates/sources.list
index 799e4b58..799e4b58 100644
--- a/deploy/adapters/ansible/roles/pre-prepare/templates/sources.list
+++ b/deploy/adapters/ansible/roles/pre-openstack/templates/sources.list
diff --git a/deploy/adapters/ansible/roles/pre-prepare/vars/main.yml b/deploy/adapters/ansible/roles/pre-openstack/vars/main.yml
index f44a9f9f..f44a9f9f 100644
--- a/deploy/adapters/ansible/roles/pre-prepare/vars/main.yml
+++ b/deploy/adapters/ansible/roles/pre-openstack/vars/main.yml
diff --git a/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml
index efe8745b..f636ed10 100644
--- a/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml
@@ -12,3 +12,5 @@
           cd /opt/openstack-ansible/playbooks; \
           openstack-ansible setup-ovs.yml \
              | tee -a /var/log/osa/ovs.log > /dev/null"
+  when: NEUTRON_MECHANISM_DRIVERS[0] == "openvswitch" or \
+        NEUTRON_MECHANISM_DRIVERS[0] == "opendaylight"
diff --git a/deploy/compass_conf/package_installer/ansible-ocata.conf b/deploy/compass_conf/package_installer/ansible-ocata.conf
index 5078606e..45e7cbe5 100755
--- a/deploy/compass_conf/package_installer/ansible-ocata.conf
+++ b/deploy/compass_conf/package_installer/ansible-ocata.conf
@@ -7,7 +7,7 @@ SETTINGS = {
     'playbook_file': 'site.yml',
     'inventory_file': 'inventory.yml',
     'group_variable': 'all',
-    'etc_hosts_path': 'roles/common/templates/hosts',
+    'etc_hosts_path': 'roles/pre-openstack/templates/hosts',
     'runner_dirs': ['roles','openstack_ocata/templates','openstack_ocata/roles']
 }