diff options
| author | Miroslav Suchý <msuchy@redhat.com> | 2015-03-06 12:47:21 +0000 |
|---|---|---|
| committer | Miroslav Suchý <msuchy@redhat.com> | 2015-03-06 12:57:43 +0000 |
| commit | 348f2b070e1f1df783a8cb3e7e306e142c7fbecb (patch) | |
| tree | b925f79a267f044da615231cd5eeab43ccdc1212 | |
| parent | acc3ccf3908eb30e9ed0167b01126fafd541b3f9 (diff) | |
| download | ansible-348f2b070e1f1df783a8cb3e7e306e142c7fbecb.tar.gz ansible-348f2b070e1f1df783a8cb3e7e306e142c7fbecb.tar.xz ansible-348f2b070e1f1df783a8cb3e7e306e142c7fbecb.zip | |
move non-ssl swift to 7080
so it does not confilect with novncproxy
| -rw-r--r-- | files/fedora-cloud/haproxy.cfg | 4 | ||||
| -rw-r--r-- | playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml | 17 |
2 files changed, 12 insertions, 9 deletions
diff --git a/files/fedora-cloud/haproxy.cfg b/files/fedora-cloud/haproxy.cfg index e4011ae8d..5489f0818 100644 --- a/files/fedora-cloud/haproxy.cfg +++ b/files/fedora-cloud/haproxy.cfg @@ -70,7 +70,7 @@ frontend cinder default_backend cinder frontend swift - bind 0.0.0.0:8000 ssl crt /etc/haproxy/fed-cloud09.combined + bind 0.0.0.0:8080 ssl crt /etc/haproxy/fed-cloud09.combined default_backend swift frontend nova @@ -96,7 +96,7 @@ backend cinder server cinder 127.0.0.1:6776 check backend swift - server swift 127.0.0.1:6000 check + server swift 127.0.0.1:7080 check backend nova server nova 127.0.0.1:6774 check diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml index 19f5d084f..745cccd8e 100644 --- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml @@ -145,10 +145,10 @@ copy: src={{ private }}/files/openstack/fed-cloud09.pem dest=/etc/pki/tls/certs/fed-cloud09-neutron.pem mode=600 owner=neutron group=root - name: add ssl key for neutron copy: src={{ private }}/files/openstack/fed-cloud09.key dest=/etc/pki/tls/private/fed-cloud09-neutron.key mode=600 owner=neutron group=root - - name: add ssl cert for nova - copy: src={{ private }}/files/openstack/fed-cloud09.pem dest=/etc/pki/tls/certs/fed-cloud09-nova.pem mode=600 owner=nova group=root - - name: add ssl key for nova - copy: src={{ private }}/files/openstack/fed-cloud09.key dest=/etc/pki/tls/private/fed-cloud09-nova.key mode=600 owner=nova group=root + #- name: add ssl cert for nova + # copy: src={{ private }}/files/openstack/fed-cloud09.pem dest=/etc/pki/tls/certs/fed-cloud09-nova.pem mode=600 owner=nova group=root + #- name: add ssl key for nova + # copy: src={{ private }}/files/openstack/fed-cloud09.key dest=/etc/pki/tls/private/fed-cloud09-nova.key mode=600 owner=nova group=root # http://docs.openstack.org/trunk/install-guide/install/yum/content/basics-database-controller.html - name: install mysql packages @@ -352,8 +352,11 @@ - ini_file: dest=/etc/nova/nova.conf section=DEFAULT option=osapi_compute_listen_port value=6774 - ini_file: dest=/etc/nova/nova.conf section=DEFAULT option=ec2_listen_port value=6773 - ini_file: dest=/etc/nova/nova.conf section=DEFAULT option=glance_api_servers value=https://{{ controller_hostname }}:9292 - - ini_file: dest=/etc/nova/nova.conf section=DEFAULT option=cert value=/etc/pki/tls/certs/fed-cloud09-nova.pem - - ini_file: dest=/etc/nova/nova.conf section=DEFAULT option=key value=/etc/pki/tls/private/fed-cloud09-nova.key + #- ini_file: dest=/etc/nova/nova.conf section=DEFAULT option=cert value=/etc/pki/tls/certs/fed-cloud09-nova.pem + #- ini_file: dest=/etc/nova/nova.conf section=DEFAULT option=key value=/etc/pki/tls/private/fed-cloud09-nova.key + - ini_file: dest=/etc/nova/nova.conf section=DEFAULT option=novncproxy_host value={{ controller_hostname }} + - ini_file: dest=/etc/nova/nova.conf section=DEFAULT option=ssl_only value=False + - ini_file: dest=/etc/glance/glance-api.conf section=keystone_authtoken option=auth_uri value=https://{{ controller_hostname }}:5000 - ini_file: dest=/etc/glance/glance-api.conf section=keystone_authtoken option=auth_protocol value=https @@ -405,7 +408,7 @@ - ini_file: dest=/etc/swift/proxy-server.conf section="filter:authtoken" option=auth_protocol value=https - ini_file: dest=/etc/swift/proxy-server.conf section="filter:authtoken" option=auth_host value={{ controller_hostname }} - ini_file: dest=/etc/swift/proxy-server.conf section="filter:authtoken" option=cafile value=/etc/pki/tls/certs/fed-cloud09-keystone.pem - - ini_file: dest=/etc/swift/proxy-server.conf section=DEFAULT option=bind_port value=6080 + - ini_file: dest=/etc/swift/proxy-server.conf section=DEFAULT option=bind_port value=7080 - ini_file: dest=/etc/swift/proxy-server.conf section=DEFAULT option=bind_ip value=127.0.0.1 - ini_file: dest=/etc/ceilometer/ceilometer.conf section=keystone_authtoken option=auth_uri value=https://{{ controller_hostname }}:5000 |