diff --git a/etc/openstack_deploy/user_variables.yml b/etc/openstack_deploy/user_variables.yml index 7494a476f1..b424d531b3 100644 --- a/etc/openstack_deploy/user_variables.yml +++ b/etc/openstack_deploy/user_variables.yml @@ -118,6 +118,7 @@ debug: false # placed both on the hosts and inside the containers. ## Example environment variable setup: +## (1) This sets up a permanent environment, used during and after deployment: # proxy_env_url: http://username:pa$$w0rd@10.10.10.9:9000/ # no_proxy_env: "localhost,127.0.0.1,{{ internal_lb_vip_address }},{{ external_lb_vip_address }},{% for host in groups['all_containers'] %}{{ hostvars[host]['container_address'] }}{% if not loop.last %},{% endif %}{% endfor %}" # global_environment_variables: @@ -127,6 +128,12 @@ debug: false # http_proxy: "{{ proxy_env_url }}" # https_proxy: "{{ proxy_env_url }}" # no_proxy: "{{ no_proxy_env }}" +# +## (2) This is applied only during deployment, nothing is left after deployment is complete: +# deployment_environment_variables: +# http_proxy: http://username:pa$$w0rd@10.10.10.9:9000/ +# https_proxy: http://username:pa$$w0rd@10.10.10.9:9000/ +# no_proxy: "localhost,127.0.0.1,{{ internal_lb_vip_address }},{{ external_lb_vip_address }}" ## SSH connection wait time diff --git a/playbooks/ceph-install.yml b/playbooks/ceph-install.yml index 40a7653c2d..149ee81a94 100644 --- a/playbooks/ceph-install.yml +++ b/playbooks/ceph-install.yml @@ -73,6 +73,7 @@ - crontab vars: is_metal: "{{ properties.is_metal|default(false) }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - ceph - ceph-mon @@ -145,6 +146,7 @@ - role: "system_crontab_coordination" tags: - crontab + environment: "{{ deployment_environment_variables | default({}) }}" tags: - ceph - ceph-osd diff --git a/playbooks/etcd-install.yml b/playbooks/etcd-install.yml index 2f25cdd8d2..e5289230fd 100644 --- a/playbooks/etcd-install.yml +++ b/playbooks/etcd-install.yml @@ -29,3 +29,5 @@ - role: "system_crontab_coordination" vars: is_metal: "{{ properties.is_metal|default(false) }}" + environment: "{{ deployment_environment_variables | default({}) }}" + diff --git a/playbooks/galera-install.yml b/playbooks/galera-install.yml index a8167f9483..2e8c67dbe0 100644 --- a/playbooks/galera-install.yml +++ b/playbooks/galera-install.yml @@ -33,6 +33,7 @@ - include: common-tasks/package-cache-proxy.yml vars: is_metal: "{{ properties.is_metal|default(false) }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - galera @@ -64,5 +65,6 @@ galera_address: 127.0.0.1 galera_server_id: "{{ inventory_hostname | string_2_int }}" galera_wsrep_node_name: "{{ container_name }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - galera diff --git a/playbooks/haproxy-install.yml b/playbooks/haproxy-install.yml index 78cddc4330..ba5555596b 100644 --- a/playbooks/haproxy-install.yml +++ b/playbooks/haproxy-install.yml @@ -33,6 +33,7 @@ - "{{ haproxy_keepalived_vars_file | default('vars/configs/keepalived_haproxy.yml') }}" vars: is_metal: "{{ properties.is_metal|default(false) }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - haproxy-config - haproxy @@ -73,5 +74,6 @@ - vars/configs/haproxy_config.yml vars: is_metal: "{{ properties.is_metal|default(false) }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - haproxy diff --git a/playbooks/lxc-containers-create.yml b/playbooks/lxc-containers-create.yml index 1555b499a6..a64b9543b5 100644 --- a/playbooks/lxc-containers-create.yml +++ b/playbooks/lxc-containers-create.yml @@ -33,5 +33,6 @@ timeout: "{{ lxc_container_wait_params.timeout | default(omit) }}" vars: is_metal: "{{ properties.is_metal|default(false) }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - lxc-containers-create diff --git a/playbooks/lxc-hosts-setup.yml b/playbooks/lxc-hosts-setup.yml index 023da9a0b7..6db3cc0541 100644 --- a/playbooks/lxc-hosts-setup.yml +++ b/playbooks/lxc-hosts-setup.yml @@ -55,5 +55,6 @@ - defaults/repo_packages/openstack_services.yml vars: pip_lock_to_internal_repo: False + environment: "{{ deployment_environment_variables | default({}) }}" tags: - lxc-hosts diff --git a/playbooks/memcached-install.yml b/playbooks/memcached-install.yml index ae723095b6..290856d183 100644 --- a/playbooks/memcached-install.yml +++ b/playbooks/memcached-install.yml @@ -39,5 +39,6 @@ - crontab vars: is_metal: "{{ properties.is_metal|default(false) }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - memcached diff --git a/playbooks/openstack-hosts-setup.yml b/playbooks/openstack-hosts-setup.yml index b6a3467ab9..46973a4682 100644 --- a/playbooks/openstack-hosts-setup.yml +++ b/playbooks/openstack-hosts-setup.yml @@ -64,5 +64,6 @@ msg: "The only supported platforms for this release are Ubuntu 16.04 LTS (Xenial) and CentOS 7 (WIP)" roles: - role: "openstack_hosts" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - openstack-hosts diff --git a/playbooks/os-aodh-install.yml b/playbooks/os-aodh-install.yml index 077921a530..da9a760a32 100644 --- a/playbooks/os-aodh-install.yml +++ b/playbooks/os-aodh-install.yml @@ -62,5 +62,6 @@ aodh_rabbitmq_servers: "{{ rabbitmq_servers }}" aodh_rabbitmq_port: "{{ rabbitmq_port }}" aodh_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - aodh diff --git a/playbooks/os-barbican-install.yml b/playbooks/os-barbican-install.yml index 53affbe9dd..4add1250f2 100644 --- a/playbooks/os-barbican-install.yml +++ b/playbooks/os-barbican-install.yml @@ -57,5 +57,6 @@ - rsyslog vars: is_metal: "{{ properties.is_metal|default(false) }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - barbican diff --git a/playbooks/os-ceilometer-install.yml b/playbooks/os-ceilometer-install.yml index c71259decf..383b0e814b 100644 --- a/playbooks/os-ceilometer-install.yml +++ b/playbooks/os-ceilometer-install.yml @@ -49,5 +49,6 @@ - rsyslog vars: is_metal: "{{ properties.is_metal|default(false) }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - ceilometer diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml index 8b158246d5..5d3dc07041 100644 --- a/playbooks/os-cinder-install.yml +++ b/playbooks/os-cinder-install.yml @@ -122,5 +122,6 @@ cinder_galera_user: cinder cinder_galera_database: cinder cinder_galera_address: "{{ galera_address }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - cinder diff --git a/playbooks/os-designate-install.yml b/playbooks/os-designate-install.yml index b2b2f403fc..681adfe231 100644 --- a/playbooks/os-designate-install.yml +++ b/playbooks/os-designate-install.yml @@ -72,5 +72,6 @@ - rsyslog vars: is_metal: "{{ properties.is_metal|default(false) }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - designate diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml index ce6d86c0d3..ee47deed25 100644 --- a/playbooks/os-glance-install.yml +++ b/playbooks/os-glance-install.yml @@ -93,5 +93,6 @@ glance_galera_user: glance glance_galera_database: glance glance_galera_address: "{{ galera_address }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - glance diff --git a/playbooks/os-gnocchi-install.yml b/playbooks/os-gnocchi-install.yml index 9c48186d09..464f04f33b 100644 --- a/playbooks/os-gnocchi-install.yml +++ b/playbooks/os-gnocchi-install.yml @@ -66,5 +66,6 @@ gnocchi_galera_user: gnocchi gnocchi_galera_database: gnocchi gnocchi_galera_address: "{{ galera_address }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - gnocchi diff --git a/playbooks/os-heat-install.yml b/playbooks/os-heat-install.yml index deab3b17fe..7e5ec5ebb2 100644 --- a/playbooks/os-heat-install.yml +++ b/playbooks/os-heat-install.yml @@ -75,5 +75,6 @@ heat_galera_user: heat heat_galera_database: heat heat_galera_address: "{{ galera_address }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - heat diff --git a/playbooks/os-horizon-install.yml b/playbooks/os-horizon-install.yml index 2fecf5509b..dd0fa49afa 100644 --- a/playbooks/os-horizon-install.yml +++ b/playbooks/os-horizon-install.yml @@ -50,5 +50,6 @@ horizon_galera_user: horizon horizon_galera_database: horizon horizon_galera_address: "{{ galera_address }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - horizon diff --git a/playbooks/os-ironic-install.yml b/playbooks/os-ironic-install.yml index 86956b09b2..dbe015f8d0 100644 --- a/playbooks/os-ironic-install.yml +++ b/playbooks/os-ironic-install.yml @@ -57,5 +57,6 @@ ironic_galera_user: ironic ironic_galera_database: ironic ironic_galera_address: "{{ galera_address }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - ironic diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml index ace9b51522..57b5f64f32 100644 --- a/playbooks/os-keystone-install.yml +++ b/playbooks/os-keystone-install.yml @@ -109,5 +109,6 @@ keystone_galera_user: keystone keystone_galera_database: keystone keystone_galera_address: "{{ galera_address }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - keystone diff --git a/playbooks/os-magnum-install.yml b/playbooks/os-magnum-install.yml index e1816c3143..51dde07964 100644 --- a/playbooks/os-magnum-install.yml +++ b/playbooks/os-magnum-install.yml @@ -58,5 +58,6 @@ - rsyslog vars: is_metal: "{{ properties.is_metal|default(false) }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - "magnum" diff --git a/playbooks/os-molteniron-install.yml b/playbooks/os-molteniron-install.yml index 69fba401c9..c911e9f447 100644 --- a/playbooks/os-molteniron-install.yml +++ b/playbooks/os-molteniron-install.yml @@ -47,5 +47,6 @@ - crontab vars: is_metal: "{{ properties.is_metal|default(false) }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - molteniron diff --git a/playbooks/os-neutron-install.yml b/playbooks/os-neutron-install.yml index b430706a36..191fd11da0 100644 --- a/playbooks/os-neutron-install.yml +++ b/playbooks/os-neutron-install.yml @@ -154,5 +154,6 @@ vars: is_metal: "{{ properties.is_metal|default(false) }}" bind_prefix: "{{ provider_network_bind_prefix|default('') }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - neutron diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml index 63e90e0dff..931441480e 100644 --- a/playbooks/os-nova-install.yml +++ b/playbooks/os-nova-install.yml @@ -180,5 +180,6 @@ nova_api_galera_address: "{{ galera_address }}" nova_placement_galera_address: "{{ galera_address }}" glance_host: "{{ internal_lb_vip_address }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - nova diff --git a/playbooks/os-octavia-install.yml b/playbooks/os-octavia-install.yml index f8b9c3e160..de917ff60d 100644 --- a/playbooks/os-octavia-install.yml +++ b/playbooks/os-octavia-install.yml @@ -64,5 +64,6 @@ octavia_galera_user: octavia octavia_galera_database: octavia octavia_galera_address: "{{ galera_address }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - octavia diff --git a/playbooks/os-rally-install.yml b/playbooks/os-rally-install.yml index fccf22a6c8..5cea8ffd45 100644 --- a/playbooks/os-rally-install.yml +++ b/playbooks/os-rally-install.yml @@ -28,3 +28,4 @@ when: inventory_hostname == groups['utility_all'][0] roles: - role: "os_rally" + environment: "{{ deployment_environment_variables | default({}) }}" diff --git a/playbooks/os-sahara-install.yml b/playbooks/os-sahara-install.yml index f1194be35a..fc70a67d25 100644 --- a/playbooks/os-sahara-install.yml +++ b/playbooks/os-sahara-install.yml @@ -67,5 +67,6 @@ - rsyslog vars: is_metal: "{{ properties.is_metal|default(false) }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - sahara diff --git a/playbooks/os-swift-install.yml b/playbooks/os-swift-install.yml index 2daeb0a759..6175bd9279 100644 --- a/playbooks/os-swift-install.yml +++ b/playbooks/os-swift-install.yml @@ -51,6 +51,7 @@ swift_do_sync: True vars: is_metal: "{{ properties.is_metal|default(false) }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - swift @@ -70,5 +71,6 @@ - role: "system_crontab_coordination" tags: - crontab + environment: "{{ deployment_environment_variables | default({}) }}" tags: - swift diff --git a/playbooks/os-swift-sync.yml b/playbooks/os-swift-sync.yml index 3b9f976f01..79d832d210 100644 --- a/playbooks/os-swift-sync.yml +++ b/playbooks/os-swift-sync.yml @@ -26,5 +26,6 @@ swift_do_sync: True vars: is_metal: "{{ properties.is_metal|default(false) }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - swift diff --git a/playbooks/os-tempest-install.yml b/playbooks/os-tempest-install.yml index 450c44e35a..55b0d095b6 100644 --- a/playbooks/os-tempest-install.yml +++ b/playbooks/os-tempest-install.yml @@ -33,5 +33,6 @@ - defaults/repo_packages/openstack_testing.yml vars: is_metal: "{{ properties.is_metal|default(false) }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - tempest diff --git a/playbooks/os-trove-install.yml b/playbooks/os-trove-install.yml index 14e53871ac..f0d4bba2fa 100644 --- a/playbooks/os-trove-install.yml +++ b/playbooks/os-trove-install.yml @@ -72,5 +72,6 @@ - rsyslog vars: is_metal: "{{ properties.is_metal|default(false) }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - trove diff --git a/playbooks/rabbitmq-install.yml b/playbooks/rabbitmq-install.yml index 992fa879b2..ce7822c6a8 100644 --- a/playbooks/rabbitmq-install.yml +++ b/playbooks/rabbitmq-install.yml @@ -30,6 +30,7 @@ - role: "system_crontab_coordination" vars: is_metal: "{{ properties.is_metal|default(false) }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - rabbitmq @@ -60,6 +61,7 @@ rsyslog_client_config_name: "99-rabbitmq-rsyslog-client.conf" tags: - rsyslog + environment: "{{ deployment_environment_variables | default({}) }}" tags: - rabbitmq @@ -73,6 +75,7 @@ password: "{{ rabbitmq_monitoring_password }}" state: "present" when: rabbitmq_monitoring_password is defined + environment: "{{ deployment_environment_variables | default({}) }}" tags: - rabbitmq-config - rabbitmq diff --git a/playbooks/repo-build.yml b/playbooks/repo-build.yml index 029858b6d9..c5a6260478 100644 --- a/playbooks/repo-build.yml +++ b/playbooks/repo-build.yml @@ -131,5 +131,6 @@ - "{{ playbook_dir }}/../" - /etc/ansible/roles - /etc/openstack_deploy + environment: "{{ deployment_environment_variables | default({}) }}" tags: - repo-build diff --git a/playbooks/repo-server.yml b/playbooks/repo-server.yml index a34b11bdb7..403aa05117 100644 --- a/playbooks/repo-server.yml +++ b/playbooks/repo-server.yml @@ -66,5 +66,6 @@ - defaults/repo_packages/openstack_services.yml vars: is_metal: "{{ properties.is_metal|default(false) }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - repo-server diff --git a/playbooks/rsyslog-install.yml b/playbooks/rsyslog-install.yml index 4c9ecd3151..574baae9c1 100644 --- a/playbooks/rsyslog-install.yml +++ b/playbooks/rsyslog-install.yml @@ -36,5 +36,6 @@ - crontab vars: is_metal: "{{ properties.is_metal|default(false) }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - rsyslog diff --git a/playbooks/security-hardening.yml b/playbooks/security-hardening.yml index 3c6f98586a..702556cebc 100644 --- a/playbooks/security-hardening.yml +++ b/playbooks/security-hardening.yml @@ -24,5 +24,6 @@ roles: - role: "openstack-ansible-security" when: apply_security_hardening | bool + environment: "{{ deployment_environment_variables | default({}) }}" tags: - security diff --git a/playbooks/unbound-install.yml b/playbooks/unbound-install.yml index 3efbe31442..2701b03042 100644 --- a/playbooks/unbound-install.yml +++ b/playbooks/unbound-install.yml @@ -97,3 +97,4 @@ vars: #Only run the resolvconf role when DNS containers are deployed to the env. resolvconf_enabled: "{{ groups['unbound'] is defined and groups['unbound'] | length > 0 }}" + environment: "{{ deployment_environment_variables | default({}) }}" diff --git a/playbooks/utility-install.yml b/playbooks/utility-install.yml index c3d4f8655e..e40df4ac2b 100644 --- a/playbooks/utility-install.yml +++ b/playbooks/utility-install.yml @@ -85,5 +85,6 @@ when: utility_ssh_private_key is defined vars: is_metal: "{{ properties.is_metal|default(false) }}" + environment: "{{ deployment_environment_variables | default({}) }}" tags: - utility