From f93fc4fc70694d21f136ae1599b13fd237018b74 Mon Sep 17 00:00:00 2001 From: chigang Date: Tue, 4 Jul 2017 13:21:12 +0800 Subject: [PATCH] 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 --- deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml | 8 +++----- .../roles/{config-deployment => config-osa}/files/cinder.yml | 0 .../roles/{config-deployment => config-osa}/files/http.yml | 0 .../files/os-flavor/tasks/main.yml | 0 .../files/os-flavor/vars/main.yml | 0 .../roles/{config-deployment => config-osa}/files/setup-ovs.yml | 0 .../roles/{config-deployment => config-osa}/tasks/main.yml | 0 .../roles/{config-deployment => config-osa}/templates/ansible.cfg | 0 .../templates/create-flavor.yml.j2 | 0 .../templates/create-network.yml.j2 | 0 .../templates/openstack_user_config.yml.j2 | 0 .../templates/user_variables.yml.j2 | 1 + .../roles/{openstack-post => post-openstack}/tasks/main.yml | 0 .../roles/{openstack-post => post-openstack}/vars/main.yml | 0 .../roles/{pre-prepare => pre-openstack}/files/centos_base.repo | 0 .../ansible/roles/{pre-prepare => pre-openstack}/files/modules | 0 .../ansible/roles/{pre-prepare => pre-openstack}/tasks/RedHat.yml | 0 .../ansible/roles/{pre-prepare => pre-openstack}/tasks/Ubuntu.yml | 0 .../ansible/roles/{pre-prepare => pre-openstack}/tasks/main.yml | 0 .../ansible/roles/{common => pre-openstack}/templates/hosts | 0 .../roles/{pre-prepare => pre-openstack}/templates/sources.list | 0 .../ansible/roles/{pre-prepare => pre-openstack}/vars/main.yml | 0 deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml | 2 ++ deploy/compass_conf/package_installer/ansible-ocata.conf | 2 +- 24 files changed, 7 insertions(+), 6 deletions(-) rename deploy/adapters/ansible/roles/{config-deployment => config-osa}/files/cinder.yml (100%) rename deploy/adapters/ansible/roles/{config-deployment => config-osa}/files/http.yml (100%) rename deploy/adapters/ansible/roles/{config-deployment => config-osa}/files/os-flavor/tasks/main.yml (100%) rename deploy/adapters/ansible/roles/{config-deployment => config-osa}/files/os-flavor/vars/main.yml (100%) rename deploy/adapters/ansible/roles/{config-deployment => config-osa}/files/setup-ovs.yml (100%) rename deploy/adapters/ansible/roles/{config-deployment => config-osa}/tasks/main.yml (100%) rename deploy/adapters/ansible/roles/{config-deployment => config-osa}/templates/ansible.cfg (100%) rename deploy/adapters/ansible/roles/{config-deployment => config-osa}/templates/create-flavor.yml.j2 (100%) rename deploy/adapters/ansible/roles/{config-deployment => config-osa}/templates/create-network.yml.j2 (100%) rename deploy/adapters/ansible/roles/{config-deployment => config-osa}/templates/openstack_user_config.yml.j2 (100%) rename deploy/adapters/ansible/roles/{config-deployment => config-osa}/templates/user_variables.yml.j2 (97%) rename deploy/adapters/ansible/roles/{openstack-post => post-openstack}/tasks/main.yml (100%) rename deploy/adapters/ansible/roles/{openstack-post => post-openstack}/vars/main.yml (100%) rename deploy/adapters/ansible/roles/{pre-prepare => pre-openstack}/files/centos_base.repo (100%) rename deploy/adapters/ansible/roles/{pre-prepare => pre-openstack}/files/modules (100%) rename deploy/adapters/ansible/roles/{pre-prepare => pre-openstack}/tasks/RedHat.yml (100%) rename deploy/adapters/ansible/roles/{pre-prepare => pre-openstack}/tasks/Ubuntu.yml (100%) rename deploy/adapters/ansible/roles/{pre-prepare => pre-openstack}/tasks/main.yml (100%) rename deploy/adapters/ansible/roles/{common => pre-openstack}/templates/hosts (100%) rename deploy/adapters/ansible/roles/{pre-prepare => pre-openstack}/templates/sources.list (100%) rename deploy/adapters/ansible/roles/{pre-prepare => pre-openstack}/vars/main.yml (100%) 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 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 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 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 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'] } -- 2.16.6