summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--prototypes/xci/file/ha/user_variables.yml1
-rw-r--r--prototypes/xci/file/mini/user_variables.yml1
-rw-r--r--prototypes/xci/file/noha/user_variables.yml1
-rw-r--r--prototypes/xci/playbooks/configure-opnfvhost.yml6
4 files changed, 9 insertions, 0 deletions
diff --git a/prototypes/xci/file/ha/user_variables.yml b/prototypes/xci/file/ha/user_variables.yml
index 65cbcc11b..094cc8cd6 100644
--- 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 e4a63a257..7a0b8064d 100644
--- 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 e4a63a257..7a0b8064d 100644
--- 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 6689c8dc7..06e27e7fc 100644
--- 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