Fix keepalived ping address

JIRA:-

Replace OSA default address with  ntp_server address.
OSA will use it to check internet connection.
Rename some roles that make users confused.

Change-Id: I4dd7e242e427e5bc3a611450a3bc436e44a8fefe
Signed-off-by: chigang <chigang@huawei.com>

diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
index 663f02b..417c054 100644 (file)
--- 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
similarity index 100%
rename from deploy/adapters/ansible/roles/config-deployment/files/cinder.yml
rename to 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
similarity index 100%
rename from deploy/adapters/ansible/roles/config-deployment/files/http.yml
rename to 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
similarity index 100%
rename from deploy/adapters/ansible/roles/config-deployment/files/os-flavor/tasks/main.yml
rename to 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
similarity index 100%
rename from deploy/adapters/ansible/roles/config-deployment/files/os-flavor/vars/main.yml
rename to 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
similarity index 100%
rename from deploy/adapters/ansible/roles/config-deployment/files/setup-ovs.yml
rename to 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
similarity index 100%
rename from deploy/adapters/ansible/roles/config-deployment/tasks/main.yml
rename to 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
similarity index 100%
rename from deploy/adapters/ansible/roles/config-deployment/templates/ansible.cfg
rename to 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
similarity index 100%
rename from deploy/adapters/ansible/roles/config-deployment/templates/create-flavor.yml.j2
rename to 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
similarity index 100%
rename from deploy/adapters/ansible/roles/config-deployment/templates/create-network.yml.j2
rename to 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
similarity index 100%
rename from deploy/adapters/ansible/roles/config-deployment/templates/openstack_user_config.yml.j2
rename to 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
similarity index 97%
rename from deploy/adapters/ansible/roles/config-deployment/templates/user_variables.yml.j2
rename to deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2
index 443a3f5..5157f75 100644 (file)
--- 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
similarity index 100%
rename from deploy/adapters/ansible/roles/openstack-post/tasks/main.yml
rename to 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
similarity index 100%
rename from deploy/adapters/ansible/roles/openstack-post/vars/main.yml
rename to 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
similarity index 100%
rename from deploy/adapters/ansible/roles/pre-prepare/files/centos_base.repo
rename to 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
similarity index 100%
rename from deploy/adapters/ansible/roles/pre-prepare/files/modules
rename to 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
similarity index 100%
rename from deploy/adapters/ansible/roles/pre-prepare/tasks/RedHat.yml
rename to 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
similarity index 100%
rename from deploy/adapters/ansible/roles/pre-prepare/tasks/Ubuntu.yml
rename to 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
similarity index 100%
rename from deploy/adapters/ansible/roles/pre-prepare/tasks/main.yml
rename to 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
similarity index 100%
rename from deploy/adapters/ansible/roles/common/templates/hosts
rename to 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
similarity index 100%
rename from deploy/adapters/ansible/roles/pre-prepare/templates/sources.list
rename to 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
similarity index 100%
rename from deploy/adapters/ansible/roles/pre-prepare/vars/main.yml
rename to 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 efe8745..f636ed1 100644 (file)
--- 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 5078606..45e7cbe 100755 (executable)
--- 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']
 }