Revert "Fix container hostname for RFC 1034/1035"
This reverts commit 9a737adb97
.
It will be reimplemented within the lxc_container_create role.
Change-Id: I921a6acbddbc765a81fa2aaed5b24307870ad26d
Depends-On: I9e72699354a467478742281cab74690e66b6a652
This commit is contained in:
parent
272c413b42
commit
2f4577298b
@ -45,7 +45,6 @@ keystone_external_ssl: "{{ openstack_external_ssl }}"
|
|||||||
horizon_external_ssl: "{{ openstack_external_ssl }}"
|
horizon_external_ssl: "{{ openstack_external_ssl }}"
|
||||||
|
|
||||||
## LXC options
|
## LXC options
|
||||||
lxc_container_domain: "openstack.local"
|
|
||||||
lxc_container_caches:
|
lxc_container_caches:
|
||||||
- url: "https://rpc-repo.rackspace.com/container_images/rpc-trusty-container.tgz"
|
- url: "https://rpc-repo.rackspace.com/container_images/rpc-trusty-container.tgz"
|
||||||
name: "trusty.tgz"
|
name: "trusty.tgz"
|
||||||
|
@ -30,28 +30,5 @@
|
|||||||
delay: 1
|
delay: 1
|
||||||
tags:
|
tags:
|
||||||
- lxc-container-wait-for-ssh
|
- lxc-container-wait-for-ssh
|
||||||
- name: Create domain config
|
|
||||||
lineinfile:
|
|
||||||
dest: "/etc/hosts"
|
|
||||||
regexp: "^127.0.1.1"
|
|
||||||
line: "127.0.1.1 {{ inventory_hostname | replace('_', '-') }}.{{ lxc_container_domain }} {{ inventory_hostname | replace('_', '-') }}"
|
|
||||||
owner: "root"
|
|
||||||
group: "root"
|
|
||||||
mode: "0644"
|
|
||||||
tags:
|
|
||||||
- lxc-container-hostname
|
|
||||||
- name: Create hostname
|
|
||||||
copy:
|
|
||||||
dest: "/etc/hostname"
|
|
||||||
content: "{{ inventory_hostname | replace('_', '-') }}"
|
|
||||||
owner: "root"
|
|
||||||
group: "root"
|
|
||||||
mode: "0644"
|
|
||||||
tags:
|
|
||||||
- lxc-container-hostname
|
|
||||||
- name: Setup hostname
|
|
||||||
command: hostname -F /etc/hostname
|
|
||||||
tags:
|
|
||||||
- lxc-container-hostname
|
|
||||||
vars:
|
vars:
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
is_metal: "{{ properties.is_metal|default(false) }}"
|
||||||
|
@ -1,15 +0,0 @@
|
|||||||
---
|
|
||||||
features:
|
|
||||||
- LXC containers will now have a proper RFC1034/5 hostname set during post
|
|
||||||
build tasks. A localhost entry for 127.0.1.1 will be created by converting
|
|
||||||
all of the "_" in the ``inventory_hostname`` to "-". Containers will be
|
|
||||||
created with a default domain of *openstack.local*.
|
|
||||||
This domain name can be customized to meet your deployment needs by
|
|
||||||
setting the option ``lxc_container_domain``.
|
|
||||||
upgrade:
|
|
||||||
- LXC containers will now have a proper RFC1034/5 hostname set during post
|
|
||||||
build tasks. A localhost entry for 127.0.1.1 will be created by converting
|
|
||||||
all of the "_" in the ``inventory_hostname`` to "-". Containers will be
|
|
||||||
created with a default domain of *openstack.local*.
|
|
||||||
This domain name can be customized to meet your deployment needs by
|
|
||||||
setting the option ``lxc_container_domain``.
|
|
Loading…
Reference in New Issue
Block a user