diff options
Diffstat (limited to 'deploy')
-rw-r--r-- | deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml | 16 | ||||
-rw-r--r-- | deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2 | 8 | ||||
-rw-r--r-- | deploy/conf/compass.conf | 3 |
3 files changed, 18 insertions, 9 deletions
diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml index 49f76cc7..3f58435e 100644 --- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml +++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml @@ -51,12 +51,18 @@ roles: - setup-openvswitch -- hosts: localhost +- hosts: + - localhost + - neutron_all + - galera_container + - network_hosts + - repo_container + - utility remote_user: root roles: - - setup-sfc + - setup-odl tags: - - sfc + - odl - hosts: - localhost @@ -67,9 +73,9 @@ - utility remote_user: root roles: - - setup-odl + - setup-odl-sfc tags: - - odl + - odl_sfc - hosts: - utility_all[0] diff --git a/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2 b/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2 index e43aa22c..ebd8ff09 100644 --- a/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2 +++ b/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2 @@ -19,7 +19,7 @@ # ## # # Debug and Verbose options. -debug: false +debug: true haproxy_keepalived_external_vip_cidr: "{{ public_vip.ip }}/32" haproxy_keepalived_internal_vip_cidr: "{{ internal_vip.ip }}/32" @@ -28,8 +28,10 @@ haproxy_keepalived_internal_interface: br-mgmt keepalived_ping_address: "{{ ntp_server }}" cinder_cinder_conf_overrides: - DEFAULT: - public_endpoint: "https://{{ public_vip.ip }}" + oslo_middleware: + enable_proxy_headers_parsing: True + +nfs_file_gw: False {% if "openvswitch" == NEUTRON_MECHANISM_DRIVERS[0] or "opendaylight" == NEUTRON_MECHANISM_DRIVERS[0] diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf index bcf295c9..98ba3027 100644 --- a/deploy/conf/compass.conf +++ b/deploy/conf/compass.conf @@ -14,8 +14,9 @@ export COMPASS_EXTERNAL_GW=${COMPASS_EXTERNAL_GW:-} export LANGUAGE="EN" export TIMEZONE="America/Los_Angeles" export NTP_SERVER="$COMPASS_SERVER" -export NAMESERVERS="$COMPASS_SERVER" +export NAMESERVERS=${USER_NAMESERVER:-"$COMPASS_SERVER"} export COMPASS_REPO_PORT="5151" +export OFFLINE_DEPLOY=${OFFLINE_DEPLOY:-'Disable'} export COMPASS_DECK="compass4nfv/compass-deck" export COMPASS_TASKS="compass4nfv/compass-tasks-osa:euphrates" |