Merge "Upgrade OpenStack version from Pike to Queens"

5 files changed, 5 insertions, 24 deletions

diff --git a/deploy/adapters/ansible/roles/config-osa/files/chrony.conf.j2 b/deploy/adapters/ansible/roles/config-osa/files/chrony.conf.j2
index 1c2443e0..d58f9115 100644
--- a/deploy/adapters/ansible/roles/config-osa/files/chrony.conf.j2
+++ b/deploy/adapters/ansible/roles/config-osa/files/chrony.conf.j2
@@ -98,7 +98,5 @@ rtconutc
 # Listen for NTP requests only on local interfaces.
 port 0
 bindcmdaddress 127.0.0.1
-{% if not security_disable_ipv6 | bool %}
 bindcmdaddress ::1
 {% endif %}
-{% endif %}
diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/fix_rescue.yml b/deploy/adapters/ansible/roles/config-osa/tasks/fix_rescue.yml
index ff7d4250..c73aceb7 100644
--- a/deploy/adapters/ansible/roles/config-osa/tasks/fix_rescue.yml
+++ b/deploy/adapters/ansible/roles/config-osa/tasks/fix_rescue.yml
@@ -28,7 +28,7 @@
 
 - name: fix rescue problem for lxc-hosts-setup
   blockinfile:
-    dest: "/opt/openstack-ansible/playbooks/lxc-hosts-setup.yml"
+    dest: "/opt/openstack-ansible/playbooks/containers-lxc-host.yml"
     block: |
       - hosts: localhost
         user: root
@@ -38,7 +38,7 @@
 
 - name: delete max_fail_percentage for lxc-hosts-setup
   lineinfile:
-    dest: "/opt/openstack-ansible/playbooks/lxc-hosts-setup.yml"
+    dest: "/opt/openstack-ansible/playbooks/containers-lxc-host.yml"
     regexp: "max_fail_percentage*"
     state: absent
 
diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
index 766043d5..3f9dbe1f 100755
--- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
@@ -163,7 +163,7 @@
 
 - name: remove repo_build_pip_no_binary
   lineinfile:
-    dest: /opt/openstack-ansible/group_vars/repo_all.yml
+    dest: /opt/openstack-ansible/inventory/group_vars/repo_all.yml
     state: absent
     regexp: "{{ item }}"
   with_items: ['^repo_build_pip_no_binary:', '^  - libvirt-python']
@@ -348,20 +348,8 @@
 #    insertafter: "^- include: repo_post_build.yml"
 #    line: "- include: repo_fix_pandas.yml"
 
-- include: meters.yml
-
-# upstream has fix this issue so somments it
-# maybe will use in the furture
-- include: fix_pip_version.yml
-
 - include: fix_rescue.yml
 
-- name: include tacker in setup-openstack
-  lineinfile:
-    dest: /opt/openstack-ansible/playbooks/setup-openstack.yml
-    insertafter: "^- include: os-trove"
-    line: "- include: os-tacker-install.yml"
-
 - name: rm command "rm -f /etc/resolv.conf" in cache_prep_commands
   lineinfile:
     dest: /etc/ansible/roles/lxc_hosts/vars/ubuntu-16.04.yml
@@ -374,8 +362,3 @@
     dest: /etc/ansible/roles/lxc_hosts/vars/ubuntu-16.04.yml
     insertafter: '^  cache_prep_commands:'
     line: '    rm /etc/resolv.conf || true'
-
-- name: add variables file of tacker for centos
-  copy:
-    src: redhat-7.yml
-    dest: /etc/ansible/roles/os_tacker/vars/redhat-7.yml
diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/meters.yml b/deploy/adapters/ansible/roles/config-osa/tasks/meters.yml
index 2b3bce5f..ca85f440 100644
--- a/deploy/adapters/ansible/roles/config-osa/tasks/meters.yml
+++ b/deploy/adapters/ansible/roles/config-osa/tasks/meters.yml
@@ -9,7 +9,7 @@
 ---
 - name: modify the aodh haproxy config
   copy:
-    dest: /opt/openstack-ansible/group_vars/all/haproxy.yml
+    dest: /opt/openstack-ansible/inventory/group_vars/all/haproxy.yml
     src: haproxy.yml
     mode: 0664
 
diff --git a/deploy/adapters/ansible/roles/config-osa/vars/main.yml b/deploy/adapters/ansible/roles/config-osa/vars/main.yml
index 65f67c18..7daf40c9 100644
--- a/deploy/adapters/ansible/roles/config-osa/vars/main.yml
+++ b/deploy/adapters/ansible/roles/config-osa/vars/main.yml
@@ -12,5 +12,5 @@ ceph_host: "{{ hostvars[inventory_hostname]['groups']['ceph_osd'][0] }}"
 repo_dest_path: "/var/www/repo/os-releases/15.1.4/ubuntu-16.04-x86_64/"
 networking_sfc_version: 4.0.0
 # yamllint disable rule:line-length
-openstack_release: "{{ lookup('yamlfile', '/opt/openstack-ansible/group_vars/all/all.yml key=openstack_release') }}"
+openstack_release: "{{ lookup('yamlfile', '/opt/openstack-ansible/inventory/group_vars/all/all.yml key=openstack_release') }}"
 # yamllint enable rule:line-length