xci: Fix the haproxy service and gnocchi db sync problem

This patch reflects the fix Tianwei found for the keystone and gnocchi
issues with HA deployment.

https://gerrit.opnfv.org/gerrit/#/c/32367/

The keystone issue should be fixed upstream but until that happens, we
can use the patch here to move us forward.

Previously removed OpenStack services have also been enabled to
try as close deployment as possible to upstream openstack-ansible.

Change-Id: Ib7b1cfe0f363381466b43a3249667c638c09d9fd
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

diff --git a/prototypes/xci/file/ha/user_variables.yml b/prototypes/xci/file/ha/user_variables.yml
index 65cbcc1..094cc8c 100644 (file)
--- a/prototypes/xci/file/ha/user_variables.yml
+++ b/prototypes/xci/file/ha/user_variables.yml
@@ -25,3 +25,4 @@ haproxy_keepalived_external_vip_cidr: "192.168.122.220/32"
 haproxy_keepalived_internal_vip_cidr: "172.29.236.222/32"
 haproxy_keepalived_external_interface: br-vlan
 haproxy_keepalived_internal_interface: br-mgmt
+gnocchi_db_sync_options: ""

diff --git a/prototypes/xci/file/mini/user_variables.yml b/prototypes/xci/file/mini/user_variables.yml
index e4a63a2..7a0b806 100644 (file)
--- a/prototypes/xci/file/mini/user_variables.yml
+++ b/prototypes/xci/file/mini/user_variables.yml
@@ -25,3 +25,4 @@ haproxy_keepalived_external_vip_cidr: "192.168.122.3/32"
 haproxy_keepalived_internal_vip_cidr: "172.29.236.11/32"
 haproxy_keepalived_external_interface: br-vlan
 haproxy_keepalived_internal_interface: br-mgmt
+gnocchi_db_sync_options: ""

diff --git a/prototypes/xci/file/noha/user_variables.yml b/prototypes/xci/file/noha/user_variables.yml
index e4a63a2..7a0b806 100644 (file)
--- a/prototypes/xci/file/noha/user_variables.yml
+++ b/prototypes/xci/file/noha/user_variables.yml
@@ -25,3 +25,4 @@ haproxy_keepalived_external_vip_cidr: "192.168.122.3/32"
 haproxy_keepalived_internal_vip_cidr: "172.29.236.11/32"
 haproxy_keepalived_external_interface: br-vlan
 haproxy_keepalived_internal_interface: br-mgmt
+gnocchi_db_sync_options: ""

diff --git a/prototypes/xci/playbooks/configure-opnfvhost.yml b/prototypes/xci/playbooks/configure-opnfvhost.yml
index 6689c8d..06e27e7 100644 (file)
--- a/prototypes/xci/playbooks/configure-opnfvhost.yml
+++ b/prototypes/xci/playbooks/configure-opnfvhost.yml
@@ -46,6 +46,12 @@
       command: "python pw-token-gen.py --file {{OPENSTACK_OSA_ETC_PATH}}/user_secrets.yml"
       args:
         chdir: "{{OPENSTACK_OSA_PATH}}/scripts"
+    # TODO: We need to get rid of this as soon as the issue is fixed upstream
+    - name: change the haproxy state from disable to enable
+      replace:
+        dest: "{{OPENSTACK_OSA_PATH}}/playbooks/os-keystone-install.yml"
+        regexp: '(\s+)haproxy_state: disabled'
+        replace: '\1haproxy_state: enabled'
     - name: copy OPNFV OpenStack playbook
       shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/prototypes/xci/file/setup-openstack.yml {{OPENSTACK_OSA_PATH}}/playbooks"
     - name: copy OPNFV role requirements