Merge "Fix repo configuration"
This commit is contained in:
commit
1d890565fe
|
@ -40,10 +40,6 @@
|
|||
shell: |
|
||||
ansible-playbook docker-playbook.yaml --extra-vars "container_registry_deployment_user={{ ansible_user }}"
|
||||
|
||||
- name: Add docker masquerading rules
|
||||
become: true
|
||||
command: iptables -t nat -A POSTROUTING -s 172.17.0.0/16 ! -o docker0 -j MASQUERADE
|
||||
|
||||
- name: Reset connection because of group changes for current user
|
||||
meta: reset_connection
|
||||
|
||||
|
@ -64,3 +60,7 @@
|
|||
shell: |
|
||||
set -ex
|
||||
cp /etc/yum.repos.d/delorean* /var/www/html/
|
||||
|
||||
- name: Add http iptables rules from containers
|
||||
command: iptables -I openstack-INPUT 1 -p tcp --dport 80 -s 172.17.0.0/16 -j ACCEPT
|
||||
become: true
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
- hosts: localhost
|
||||
become: true
|
||||
vars:
|
||||
container_registry_docker_options: --log-driver=journald --signature-verification=false --iptables=true --live-restore
|
||||
roles:
|
||||
- container-registry
|
||||
|
|
|
@ -5,5 +5,6 @@ namespace='{{ ci_branch | replace("/", "") }}'
|
|||
registry=127.0.0.1:8787
|
||||
tag=latest
|
||||
template_override={{ openstack_git_root }}/tripleo-common/container-images/tripleo_kolla_template_overrides.j2
|
||||
rpm_setup=http://localhost/delorean.repo,http://localhost/delorean-deps.repo
|
||||
# we use the repos off the main host as they will already have the correct mirror info in them
|
||||
rpm_setup_config=http://172.17.0.1/delorean.repo,http://172.17.0.1/delorean-{{ ci_branch }}-testing.repo
|
||||
|
||||
|
|
Loading…
Reference in New Issue